commit | df6c8d0bc0073ebf1aa98ea26e1da93008b7c467 | [log] [tgz] |
---|---|---|
author | Makoto Onuki <omakoto@google.com> | Thu Jan 28 00:20:35 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 28 00:20:35 2016 +0000 |
tree | 13bd927137f70226bc3f259d3097afbd348735d0 | |
parent | b98fac6f1f683b2fd06136d2cfe1537c3fce79d1 [diff] | |
parent | ca3f6fae604880db14c3f3eb5bc8908c339be0a8 [diff] |
Merge "Fix exception message"
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 4bda7d9..b94e6d6 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -1983,7 +1983,7 @@ final ResolveInfo ri = infos.get(0); if (!permission.BIND_DEVICE_ADMIN.equals(ri.activityInfo.permission)) { - final String message = "DeviceAdminReceiver " + adminName + " must be protected with" + final String message = "DeviceAdminReceiver " + adminName + " must be protected with " + permission.BIND_DEVICE_ADMIN; Slog.w(LOG_TAG, message); if (throwForMissiongPermission &&