resolve merge conflicts of 0ca33e8 to nyc-mr1-dev-plus-aosp (c1168df3) · Commits · e / os / android_frameworks_base

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

+21 −5

Original line number	Diff line number	Diff line
		@@ -419,20 +419,36 @@ public class PhoneStatusBarPolicy implements Callback, RotationLockController.Ro
		new SynchronousUserSwitchObserver() {
		@Override
		public void onUserSwitching(int newUserId) throws RemoteException {
		mHandler.post(new Runnable() {
		@Override
		public void run() {
		mUserInfoController.reloadUserInfo();
		}
		});
		}

		@Override
		public void onUserSwitchComplete(int newUserId) throws RemoteException {
		mHandler.post(new Runnable() {
		@Override
		public void run() {
		updateAlarm();
		profileChanged(newUserId);
		updateQuietState();
		updateManagedProfile();
		}
		});
		}

		@Override
		public void onForegroundProfileSwitch(int newProfileId) {
		mHandler.post(new Runnable() {
		@Override
		public void run() {
		profileChanged(newProfileId);
		}
		});
		}
		};

		private final HotspotController.Callback mHotspotCallback = new HotspotController.Callback() {