resolve merge conflicts of 5201a62 to nyc-dev-plus-aosp
Change-Id: I411ed02c96997416dc5e5eb4f289d3c25932babd
This commit is contained in:
@@ -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);
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user