resolve merge conflicts of 0ca33e8 to nyc-mr1-dev-plus-aosp

Change-Id: I363b70a22a000b4cc94381b31f0ef7053f5518eb
This commit is contained in:
Julia Reynolds
2016-05-18 10:32:51 -04:00

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);
}
});
}
};