diff options
author | Svetoslav Ganov <svetoslavganov@google.com> | 2016-05-18 21:53:32 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-18 21:53:32 +0000 |
commit | df5670f1651ac19cb01e0163851e016d6f00baa1 (patch) | |
tree | 39df68360b02b3b5db8b72f560549f29f2116a4b /src | |
parent | 230e99996f09dfe9bb6768d33655ebe0676c893d (diff) | |
parent | 6fdd93b33927675a6a062f0b8fd00ef3866ac2f7 (diff) | |
download | android_packages_apps_PackageInstaller-df5670f1651ac19cb01e0163851e016d6f00baa1.tar.gz android_packages_apps_PackageInstaller-df5670f1651ac19cb01e0163851e016d6f00baa1.tar.bz2 android_packages_apps_PackageInstaller-df5670f1651ac19cb01e0163851e016d6f00baa1.zip |
Finish package installer activity on a cancel result
am: 6fdd93b339
* commit '6fdd93b33927675a6a062f0b8fd00ef3866ac2f7':
Finish package installer activity on a cancel result
Change-Id: If34ab52b7c25cdbf69a06db5b4cf7e87b62e12bd
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/packageinstaller/PackageInstallerActivity.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index a059931d..3b191458 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -324,6 +324,8 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen // implement a "allow untrusted source once" feature. if (request == REQUEST_ENABLE_UNKNOWN_SOURCES && result == RESULT_OK) { initiateInstall(); + } else { + clearCachedApkIfNeededAndFinish(); } } @@ -474,6 +476,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen showDialogInner(DLG_ADMIN_RESTRICTS_UNKNOWN_SOURCES); } else if (!isUnknownSourcesEnabled()) { // Ask user to enable setting first + showDialogInner(DLG_UNKNOWN_SOURCES); } else { processPackageUri(packageUri); |