Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent a90127dcc8 cc8c594a5c
commit 43153f18c5
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
View File

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