commit ab83fd5739bf475c07e8e7ff140489cdcdcb73be
author Robin Lee <rgl@google.com> Mon Jan 25 18:02:40 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 25 18:02:40 2016 +0000
tree d0e5b0f38395a1a5911a32e301b2c0f3007be113
parent 5f09616e6bb793e789167e3281478b13413d0932
parent d48788c1011893fbe13c5f64db906f140a66dd0b

Merge "DPMS organisation API - Add a missing checkNotNull"

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

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 839299e..0fffd76 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -7895,6 +7895,7 @@
         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);