Commit 0156e7b2 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

PackageInstaller API refactoring.

Bug: 17008440
Change-Id: Ice56b712a96abecc3d908424d4595449927c2d3e
parent 3aeb5056
......@@ -26,7 +26,6 @@ import android.content.DialogInterface.OnCancelListener;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.content.pm.InstallSessionInfo;
import android.content.pm.ManifestDigest;
import android.content.pm.PackageInfo;
import android.content.pm.PackageInstaller;
......@@ -433,7 +432,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
final Intent intent = getIntent();
if (PackageInstaller.ACTION_CONFIRM_PERMISSIONS.equals(intent.getAction())) {
final int sessionId = intent.getIntExtra(PackageInstaller.EXTRA_SESSION_ID, -1);
final InstallSessionInfo info = mInstaller.getSessionInfo(sessionId);
final PackageInstaller.SessionInfo info = mInstaller.getSessionInfo(sessionId);
if (info == null || !info.sealed || info.resolvedBaseCodePath == null) {
Log.w(TAG, "Session " + mSessionId + " in funky state; ignoring");
finish();
......
......@@ -77,6 +77,7 @@ public class UninstallerActivity extends Activity implements OnClickListener {
.setNeutralButton(getString(R.string.dlg_ok),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dispatchAborted();
setResult(Activity.RESULT_FIRST_USER);
finish();
}})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment