Merge "Dialer: Add null check for subId when get PhoneStateListener" (fd13097a) · Commits · e / os / android_packages_apps_Dialer

src/com/android/dialer/dialpad/DialpadFragment.java

+12 −4

Original line number	Diff line number	Diff line
		@@ -2022,21 +2022,29 @@ public class DialpadFragment extends AnalyticsFragment

		private void listen() {
		for (int i = 0; i < mNumPhones; i++) {
		if (mPhoneStateListener[i] != null) {
		getTelephonyManager().listen(mPhoneStateListener[i],
		PhoneStateListener.LISTEN_CALL_STATE);
		}
		}
		}

		private void stopListen() {
		for (int i = 0; i < mNumPhones; i++) {
		if (mPhoneStateListener[i] != null) {
		getTelephonyManager().listen(mPhoneStateListener[i],
		PhoneStateListener.LISTEN_NONE);
		}
		}
		}

		private PhoneStateListener getPhoneStateListener(int phoneId) {
		long[] subId = SubscriptionManager.getSubId(phoneId);

		if (subId == null) {
		return null;
		}

		PhoneStateListener phoneStateListener = new PhoneStateListener(subId[0]) {
		@Override
		public void onCallStateChanged(int state, String incomingNumber) {