From d48788c1011893fbe13c5f64db906f140a66dd0b Mon Sep 17 00:00:00 2001
From: Robin Lee <rgl@google.com>
Date: Mon, 25 Jan 2016 17:49:35 +0000
Subject: [PATCH] DPMS organisation API - Add a missing checkNotNull

Corrects a failing test.

Change-Id: I6be8a23caef53d1e9681733e5b340237952bd3e5
---
 .../android/server/devicepolicy/DevicePolicyManagerService.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index f68a2996541df..b33a9217e222e 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -7721,6 +7721,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);