Merge "Ensure the same OnSubscriptionChangedListener is reused in... (e284ed9f) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/PhoneConfigurationManager.java

+14 −6

Original line number	Diff line number	Diff line
		@@ -228,6 +228,17 @@ public class PhoneConfigurationManager {
		}
		}

		/**
		* Listener for listening to events in the {@link android.telephony.TelephonyRegistryManager}
		*/
		private final SubscriptionManager.OnSubscriptionsChangedListener mSubscriptionsChangedListener =
		new SubscriptionManager.OnSubscriptionsChangedListener() {
		@Override
		public void onSubscriptionsChanged() {
		updateSimultaneousSubIdsFromPhoneIdMappingAndNotify();
		}
		};

		/**
		* If virtual DSDA is enabled for this UE, then increase maxActiveVoiceSubscriptions to 2.
		*/
		@@ -278,14 +289,11 @@ public class PhoneConfigurationManager {
		// Register for subId updates to notify listeners when simultaneous calling is configured
		if (mFeatureFlags.simultaneousCallingIndications()
		&& (bkwdsCompatDsda \|\| halSupportSimulCalling)) {
		Log.d(LOG_TAG, "maybeEnableCellularDSDASupport: registering "
		+ "mSubscriptionsChangedListener");
		mContext.getSystemService(TelephonyRegistryManager.class)
		.addOnSubscriptionsChangedListener(
		new SubscriptionManager.OnSubscriptionsChangedListener() {
		@Override
		public void onSubscriptionsChanged() {
		updateSimultaneousSubIdsFromPhoneIdMappingAndNotify();
		}
		}, mHandler::post);
		mSubscriptionsChangedListener, mHandler::post);
		}
		}