summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sumedh Sen <sumedhsen@google.com> 2023-11-27 21:13:32 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-11-27 21:13:32 +0000
commitdc145607402efe5078dac977a1b1c020b71a1e9c (patch)
tree7185907a884f473ce88c41f89b1f9ba3e9a361ac
parentf44051397d0e2288c7c7e58f442163b70ace0769 (diff)
Re-land "Show failure dialog when app can't be installed due to secureFRP"
This reverts commit f44051397d0e2288c7c7e58f442163b70ace0769. Reason for revert: the original change ag/25249419 was reverted on git-main due to b/312830483, b/312816948. This code change is necessary in main branch, along with other upstream branches to fix the above-mentioned bugs. Change-Id: I5a2c8349b6755e3f31b05d327dc68f4461a42963
-rw-r--r--packages/PackageInstaller/src/com/android/packageinstaller/InstallInstalling.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/InstallInstalling.java b/packages/PackageInstaller/src/com/android/packageinstaller/InstallInstalling.java
index 1088acef0fb0..4992ef1e1c00 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/InstallInstalling.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/InstallInstalling.java
@@ -290,7 +290,14 @@ public class InstallInstalling extends AlertActivity {
broadcastIntent,
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
- session.commit(pendingIntent.getIntentSender());
+ try {
+ session.commit(pendingIntent.getIntentSender());
+ } catch (Exception e) {
+ Log.e(LOG_TAG, "Cannot install package: ", e);
+ launchFailure(PackageInstaller.STATUS_FAILURE,
+ PackageManager.INSTALL_FAILED_INTERNAL_ERROR, null);
+ return;
+ }
mCancelButton.setEnabled(false);
setFinishOnTouchOutside(false);
} else {