commit | 15bdfb62cba8ff660ad180f4f9afb1262a47dff2 | [log] [tgz] |
---|---|---|
author | Svet Ganov <svetoslavganov@google.com> | Wed Jun 08 15:56:29 2016 -0700 |
committer | Svet Ganov <svetoslavganov@google.com> | Wed Jun 08 15:56:32 2016 -0700 |
tree | cdbe60655ab66cdc6cd403b14f74c6362dbe3e43 | |
parent | c02de0671582ff55133b9de38ea7ebc28eb28a19 [diff] |
Fix a crash in package installer The first bug was that we were starting the install before having the package info for the installed app. The second was that we were calling the permission review UI despite we were there before the user selected to install. i.e. the user already reviewed the permissions. bug:29197887 Change-Id: I2fac4d014dde7f7744a6b831c2b0ff510e29e8e8
diff --git a/PermissionController/src/com/android/packageinstaller/InstallAppProgress.java b/PermissionController/src/com/android/packageinstaller/InstallAppProgress.java index e93c93c..c6e3a46 100755 --- a/PermissionController/src/com/android/packageinstaller/InstallAppProgress.java +++ b/PermissionController/src/com/android/packageinstaller/InstallAppProgress.java
@@ -351,7 +351,6 @@ params.originatingUri = getIntent().getParcelableExtra(Intent.EXTRA_ORIGINATING_URI); params.originatingUid = getIntent().getIntExtra(Intent.EXTRA_ORIGINATING_UID, UID_UNKNOWN); - params.setInstallFlagsForcePermissionPrompt(); mInstallHandler.post(new Runnable() { @Override
diff --git a/PermissionController/src/com/android/packageinstaller/PackageInstallerActivity.java b/PermissionController/src/com/android/packageinstaller/PackageInstallerActivity.java index 6692d66..1903f91 100644 --- a/PermissionController/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/PermissionController/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -456,7 +456,7 @@ // Block the install attempt on the Unknown Sources setting if necessary. final boolean requestFromUnknownSource = isInstallRequestFromUnknownSource(intent); if (!requestFromUnknownSource) { - initiateInstall(); + processPackageUri(packageUri); return; }