DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master

Bug: 134405016
Change-Id: I9ecb0b4c54759a6303711461aebb9d1fe2744e79

2 files changed, 15 insertions, 4 deletions

diff --git a/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java
index 95daf87e0..85ec2d327 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);
+            }
         }
     }
 
diff --git a/src/com/android/packageinstaller/role/service/RoleSearchIndexablesProvider.java b/src/com/android/packageinstaller/role/service/RoleSearchIndexablesProvider.java
index 55076278c..4d5341cbd 100644
--- a/src/com/android/packageinstaller/role/service/RoleSearchIndexablesProvider.java
+++ b/src/com/android/packageinstaller/role/service/RoleSearchIndexablesProvider.java
@@ -19,6 +19,7 @@ package com.android.packageinstaller.role.service;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.MatrixCursor;
+import android.os.Binder;
 import android.provider.SearchIndexablesContract;
 import android.util.ArrayMap;
 
@@ -50,8 +51,13 @@ public class RoleSearchIndexablesProvider extends BaseSearchIndexablesProvider {
         for (int i = 0; i < rolesSize; i++) {
             Role role = roles.valueAt(i);
 
-            if (!role.isAvailable(context) || !role.isVisible(context)) {
-                continue;
+            long token = Binder.clearCallingIdentity();
+            try {
+                if (!role.isAvailable(context) || !role.isVisible(context)) {
+                    continue;
+                }
+            } finally {
+                Binder.restoreCallingIdentity(token);
             }
 
             String label = context.getString(role.getLabelResource());