diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-08-15 13:59:09 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2014-08-15 14:07:25 -0700 |
| commit | 0156e7b2e28048ad0914b7c4b3896d749d5a75f3 (patch) | |
| tree | ccd6cbb00b3428f7f2e0a13f41af5b7cef808ca1 | |
| parent | 3aeb50560ee8c383b7dfa65fd8c46642d2a6ef5c (diff) | |
| download | android_packages_apps_PackageInstaller-0156e7b2e28048ad0914b7c4b3896d749d5a75f3.tar.gz android_packages_apps_PackageInstaller-0156e7b2e28048ad0914b7c4b3896d749d5a75f3.tar.bz2 android_packages_apps_PackageInstaller-0156e7b2e28048ad0914b7c4b3896d749d5a75f3.zip | |
PackageInstaller API refactoring.
Bug: 17008440
Change-Id: Ice56b712a96abecc3d908424d4595449927c2d3e
| -rw-r--r-- | src/com/android/packageinstaller/PackageInstallerActivity.java | 3 | ||||
| -rwxr-xr-x | src/com/android/packageinstaller/UninstallerActivity.java | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index 2c58be80..ec1fe6b8 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -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(); diff --git a/src/com/android/packageinstaller/UninstallerActivity.java b/src/com/android/packageinstaller/UninstallerActivity.java index 71d21a64..531754e2 100755 --- a/src/com/android/packageinstaller/UninstallerActivity.java +++ b/src/com/android/packageinstaller/UninstallerActivity.java @@ -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(); }}) |