Merge "DPMS organisation API - Add a missing checkNotNull"

2016-01-25 18:02:40 +00:00
parent 5f09616e6b d48788c101
commit ab83fd5739
1 changed files with 1 additions and 0 deletions
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -7895,6 +7895,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
        if (!mHasFeature || !isManagedProfile(userHandle)) {
            return ActiveAdmin.DEF_ORGANIZATION_COLOR;
        }
+        Preconditions.checkNotNull(who, "ComponentName is null");
        synchronized (this) {
            ActiveAdmin admin = getActiveAdminForCallerLocked(who,
                    DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);