From 48e64f20f328a40505f35062f870a7f6e5ab9ff6 Mon Sep 17 00:00:00 2001 From: Esteban Talavera Date: Wed, 10 Feb 2016 16:24:28 +0000 Subject: [PATCH] Check for null on app restrictions managing app APIs Change-Id: I3d3cc9b4a4bd6a2526fd0bd7d8662c6b07183208 --- .../com/android/server/devicepolicy/DevicePolicyManagerService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 3fb5a0d39b84..338628d64fcb 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -6093,6 +6093,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); @@ -6104,6 +6106,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); -- 2.11.0