diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-03 03:19:21 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-03 03:19:21 +0000 |
commit | 5c82b7568d2809a7744ecc35962a98c5aff41ae0 (patch) | |
tree | bfd17b5febe0ec8371540914bc2152b6d7b82afe | |
parent | b306001c3feb74f20e60ef478f5b1eb2f7cbd9af (diff) | |
parent | 29ed7908265f3e947b7d790930288d6e0cb19e88 (diff) | |
download | android_packages_apps_PackageInstaller-5c82b7568d2809a7744ecc35962a98c5aff41ae0.tar.gz android_packages_apps_PackageInstaller-5c82b7568d2809a7744ecc35962a98c5aff41ae0.tar.bz2 android_packages_apps_PackageInstaller-5c82b7568d2809a7744ecc35962a98c5aff41ae0.zip |
Snap for 5704971 from 29ed7908265f3e947b7d790930288d6e0cb19e88 to qt-release
Change-Id: I0133899971af16830d76060bbcdc88b26250e835
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java index 95daf87e..85ec2d32 100644 --- a/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java @@ -231,8 +231,13 @@ public final class ReviewPermissionsFragment extends PreferenceFragmentCompat UserHandle user = UserHandle.getUserHandleForUid(pkg.applicationInfo.uid); for (String perm : pkg.requestedPermissions) { - pm.updatePermissionFlags(perm, pkg.packageName, FLAG_PERMISSION_REVIEW_REQUIRED, - 0, user); + try { + pm.updatePermissionFlags(perm, pkg.packageName, FLAG_PERMISSION_REVIEW_REQUIRED, + 0, user); + } catch (IllegalArgumentException e) { + Log.e(LOG_TAG, "Cannot unmark " + perm + " requested by " + pkg.packageName + + " as review required", e); + } } } |