am 9b4d0517: am 3c1a2011: Merge "Fix DevicePolicyManager crash when settings password quality (and possibly others)." into jb-mr1-dev

* commit '9b4d051784a67cf5d16bc773d0a32166d568677e':
  Fix DevicePolicyManager crash when settings password quality (and possibly others).
This commit is contained in:
Amith Yamasani
2012-09-10 17:14:25 -07:00
committed by Android Git Automerger

View File

@@ -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() {