Merge \\"SysUI: Mantain non-weak reference to listener\\" into nyc-mr1-dev am: d4ec5df707 (2dd45673) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java

+19 −15

Original line number	Diff line number	Diff line
		@@ -431,8 +431,13 @@ public class UserSwitcherController {
		}

		private void listenForCallState() {
		TelephonyManager.from(mContext).listen(new PhoneStateListener() {
		TelephonyManager.from(mContext).listen(mPhoneStateListener,
		PhoneStateListener.LISTEN_CALL_STATE);
		}

		private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
		private int mCallState;

		@Override
		public void onCallStateChanged(int state, String incomingNumber) {
		if (mCallState == state) return;
		@@ -445,8 +450,7 @@ public class UserSwitcherController {
		}
		refreshUsers(UserHandle.USER_NULL);
		}
		}, PhoneStateListener.LISTEN_CALL_STATE);
		}
		};

		private BroadcastReceiver mReceiver = new BroadcastReceiver() {
		@Override