From b7a685978f3ea8a1514166c6986c1f1bacedab4a Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Mon, 10 Sep 2012 10:24:36 -0700 Subject: [PATCH] Fix DevicePolicyManager crash when settings password quality (and possibly others). Bug: 7130570 Clear the calling identity before broadcasting to all users. Change-Id: Ibe84af1ee00aecfe4b2d5bb7731a952f617b4885 --- .../com/android/server/DevicePolicyManagerService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java index fd6060a7b8e8c..28a4310734c51 100644 --- a/services/java/com/android/server/DevicePolicyManagerService.java +++ b/services/java/com/android/server/DevicePolicyManagerService.java @@ -721,7 +721,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { private void sendChangedNotification() { Intent intent = new Intent(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED); intent.setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); - mContext.sendBroadcastAsUser(intent, UserHandle.ALL); + long ident = Binder.clearCallingIdentity(); + try { + // TODO: This shouldn't be sent to all users, if DPM is per user. + mContext.sendBroadcastAsUser(intent, UserHandle.ALL); + } finally { + Binder.restoreCallingIdentity(ident); + } } private void loadSettingsLocked() {