Merge "Skip generating missing permission state for unknown permissions." into rvc-dev

2020-06-17 01:00:18 +00:00
parent 3764cbaac4 d8ba685748
commit f654a5c22e
1 changed files with 3 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
@@ -2509,6 +2509,9 @@ public class PermissionManagerService extends IPermissionManager.Stub {

                for (String permissionName : requestedPermissions) {
                    BasePermission permission = mSettings.getPermission(permissionName);
+                    if (permission == null) {
+                        continue;
+                    }
                    if (Objects.equals(permission.getSourcePackageName(), PLATFORM_PACKAGE_NAME)
                            && permission.isRuntime() && !permission.isRemoved()) {
                        if (permission.isHardOrSoftRestricted()