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

Commit 66a320d3 authored by Esteban Talavera's avatar Esteban Talavera Committed by Android (Google) Code Review
Browse files

Merge "Check for null on app restrictions managing app APIs" into nyc-dev

parents 1f3895b9 48e64f20

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

+4 −0
Original line number Diff line number Diff line
@@ -6104,6 +6104,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 


    @Override

    public void setApplicationRestrictionsManagingPackage(ComponentName admin, String packageName) {

        Preconditions.checkNotNull(admin, "ComponentName is null");



        final int userHandle = mInjector.userHandleGetCallingUserId();

        synchronized (this) {

            getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
@@ -6119,6 +6121,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 


    @Override

    public String getApplicationRestrictionsManagingPackage(ComponentName admin) {

        Preconditions.checkNotNull(admin, "ComponentName is null");



        final int userHandle = mInjector.userHandleGetCallingUserId();

        synchronized (this) {

            getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);