commit 3c1a20118739fd6765e128c5d9c39c01d22a89e7
author Amith Yamasani <yamasani@google.com> Mon Sep 10 10:27:12 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 10 10:27:13 2012 -0700
tree b0142d573ce4b2d42195c40ad81eb69960a5daa5
parent 753e1280cbc3f0006b04f67385f02e1f92019f7d
parent b7a685978f3ea8a1514166c6986c1f1bacedab4a

Merge "Fix DevicePolicyManager crash when settings password quality (and possibly others)." into jb-mr1-dev

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

diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java
index fd6060a..28a4310 100644
--- a/services/java/com/android/server/DevicePolicyManagerService.java
+++ b/services/java/com/android/server/DevicePolicyManagerService.java
@@ -721,7 +721,13 @@
     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() {