Merge "Skip generating missing permission state for unknown permissions." into rvc-dev am: f654a5c22e am: d199b48fbb am: 023b67e8ea

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881635

Change-Id: I920d8d05d60927b6cd6cd1c2659a4684768f0aef
This commit is contained in:
Hai Zhang
2020-06-17 01:53:31 +00:00
committed by Automerger Merge Worker

View File

@@ -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()