Merge "Fix applicationrestrictions with delegate." into udc-dev am: ee70a183cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21481208 Change-Id: I9adc607dcbbf7b1914eb1a48a0109e5d7b19983a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -12674,7 +12674,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
|
||||
}
|
||||
return policies.get(enforcingAdmin).getValue();
|
||||
} else {
|
||||
Objects.requireNonNull(who, "ComponentName is null");
|
||||
Preconditions.checkCallAuthorization((caller.hasAdminComponent()
|
||||
&& (isProfileOwner(caller) || isDefaultDeviceOwner(caller)))
|
||||
|| (caller.hasPackage() && isCallerDelegate(caller,
|
||||
|
||||
Reference in New Issue
Block a user