diff options
author | Svetoslav Ganov <svetoslavganov@google.com> | 2016-05-18 14:28:06 -0700 |
---|---|---|
committer | Svetoslav Ganov <svetoslavganov@google.com> | 2016-05-18 14:28:10 -0700 |
commit | 6fdd93b33927675a6a062f0b8fd00ef3866ac2f7 (patch) | |
tree | 70f68d6f06e48563fec7f8f54a1fe78d26730660 /src/com/android/packageinstaller/PackageInstallerActivity.java | |
parent | 622c5b563e1f2e7a78e64129f350387613161153 (diff) | |
download | android_packages_apps_PackageInstaller-6fdd93b33927675a6a062f0b8fd00ef3866ac2f7.tar.gz android_packages_apps_PackageInstaller-6fdd93b33927675a6a062f0b8fd00ef3866ac2f7.tar.bz2 android_packages_apps_PackageInstaller-6fdd93b33927675a6a062f0b8fd00ef3866ac2f7.zip |
Finish package installer activity on a cancel result
We made a change to the PackageInstaller to start settings for
a result to allow partners to return OK to continue the install
flow, otherwise requiring the user to start install again (the
desired behavior on Nexus). This change finishes the package
installer activity if settings does not return success to
continue the install flow.
bug:28838075
Change-Id: I4ff1b1a713d46a8584baf66f379ab070226c125f
Diffstat (limited to 'src/com/android/packageinstaller/PackageInstallerActivity.java')
-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); |