commit 81a83562fcb6bbbcb78ad0bd18210a620511f2d0
author Sudheer Shanka <sudheersai@google.com> Wed Dec 30 18:17:30 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 30 18:17:30 2015 +0000
tree 7524f293a5c333badcc0cc1980110bdf9c0a3cbf
parent f32d3a06d513df9b9d3a3eca9d6bc85c6b796332
parent 137241c714734d5559b3a3b3bd1d5c900ca7a879

Merge "Update an error message."

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 2082911..cf661ce 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -5971,7 +5971,9 @@
             }
             if (activeAdmin.getUid() != mInjector.binderGetCallingUid()) {
                 mContext.enforceCallingOrSelfPermission(
-                        android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS, null);
+                        android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS,
+                        "Calling uid " + mInjector.binderGetCallingUid() + " neither owns the admin"
+                        + " " + who + " nor has MANAGE_PROFILE_AND_DEVICE_OWNERS permission");
             }
             return activeAdmin.userRestrictions;
         }