am d75d1ef0: Merge "QS: Fix crash switching users." into lmp-dev

* commit 'd75d1ef07c175c8a48a126f4e36172e03c30987c':
  QS: Fix crash switching users.
This commit is contained in:
John Spurlock
2014-07-17 20:02:14 +00:00
committed by Android Git Automerger

View File

@@ -55,6 +55,7 @@ public class ZenModeControllerImpl implements ZenModeController {
private int mUserId;
private boolean mRequesting;
private boolean mRegistered;
public ZenModeControllerImpl(Context context, Handler handler) {
mContext = context;
@@ -141,8 +142,12 @@ public class ZenModeControllerImpl implements ZenModeController {
@Override
public void setUserId(int userId) {
mUserId = userId;
if (mRegistered) {
mContext.unregisterReceiver(mReceiver);
}
mContext.registerReceiverAsUser(mReceiver, new UserHandle(mUserId),
new IntentFilter(AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED), null, null);
mRegistered = true;
}
private void fireNextAlarmChanged() {