Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d225bc58 authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-4af7c72a3ef84c01ade42047ba306467" into tm-mainline-prod 

* changes:
  [automerge] device policy: ignore unknown permission in setPermissionGrantState 2p: d71c0ce3
  device policy: ignore unknown permission in setPermissionGrantState
parents 367f743e 04e70d1b

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+12 −14
Original line number Diff line number Diff line
@@ -13985,16 +13985,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                        return;

                    }

                }

                try {

                if (!isRuntimePermission(permission)) {

                    callback.sendResult(null);

                    return;

                }

                } catch (NameNotFoundException e) {

                    throw new RemoteException("Cannot check if " + permission

                            + "is a runtime permission", e, false, true);

                }















                if (grantState == DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED















                        || grantState == DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED















                        || grantState == DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT) {










@@ -14107,11 +14101,15 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        });















    }



























    public boolean isRuntimePermission(String permissionName) throws NameNotFoundException {













    private boolean isRuntimePermission(String permissionName) {













        try {















            final PackageManager packageManager = mInjector.getPackageManager();















            PermissionInfo permissionInfo = packageManager.getPermissionInfo(permissionName, 0);















            return (permissionInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE)















                    == PermissionInfo.PROTECTION_DANGEROUS;













        } catch (NameNotFoundException e) {













            return false;













        }















    }





























    @Override