resolve merge conflicts of 5201a62 to nyc-dev-plus-aosp

am: cc8c594a5c

* commit 'cc8c594a5c5cb255907cb2eaddb37ea1321fa104':
  Handle PhoneStatusBarPolicy user switch callbacks on main thread

Change-Id: I816905527f5061e7af2fe14b42f9c0397036bdb7
This commit is contained in:
Julia Reynolds
2016-05-18 14:31:03 +00:00
committed by android-build-merger

View File

@@ -419,19 +419,35 @@ public class PhoneStatusBarPolicy implements Callback, RotationLockController.Ro
new SynchronousUserSwitchObserver() {
@Override
public void onUserSwitching(int newUserId) throws RemoteException {
mUserInfoController.reloadUserInfo();
mHandler.post(new Runnable() {
@Override
public void run() {
mUserInfoController.reloadUserInfo();
}
});
}
@Override
public void onUserSwitchComplete(int newUserId) throws RemoteException {
profileChanged(newUserId);
updateQuietState();
updateManagedProfile();
mHandler.post(new Runnable() {
@Override
public void run() {
updateAlarm();
profileChanged(newUserId);
updateQuietState();
updateManagedProfile();
}
});
}
@Override
public void onForegroundProfileSwitch(int newProfileId) {
profileChanged(newProfileId);
mHandler.post(new Runnable() {
@Override
public void run() {
profileChanged(newProfileId);
}
});
}
};