Merge "Revoke install permissions when the permission defining app is uninstalled." into rvc-qpr-dev am: 0f08ebd1f7 am: 19f2c78be9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11883881 Change-Id: I4755f9ada8925b74548e4d2946ac63c192665843
2020-07-14 19:53:37 +00:00
parent 39049a8812 19f2c78be9
commit e24ee3f234
1 changed files with 14 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -4224,6 +4224,20 @@ public class PermissionManagerService extends IPermissionManager.Stub {
                                    revokePermissionFromPackageForUser(p.getPackageName(),
                                            bp.getName(), true, userId, callback));
                        }
+                    } else {
+                        mPackageManagerInt.forEachPackage(p -> {
+                            PackageSetting ps = mPackageManagerInt.getPackageSetting(
+                                    p.getPackageName());
+                            if (ps == null) {
+                                return;
+                            }
+                            PermissionsState permissionsState = ps.getPermissionsState();
+                            if (permissionsState.getInstallPermissionState(bp.getName()) != null) {
+                                permissionsState.revokeInstallPermission(bp);
+                                permissionsState.updatePermissionFlags(bp, UserHandle.USER_ALL,
+                                        MASK_PERMISSION_FLAGS_ALL, 0);
+                            }
+                        });
                    }
                    it.remove();
                }