Merge "Fix receating APN list after other SIM is removed" (280c1e42) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+26 −22

Original line number	Diff line number	Diff line
		@@ -278,8 +278,10 @@ public class DcTracker extends Handler {
		};

		private SubscriptionManager mSubscriptionManager;
		private final OnSubscriptionsChangedListener mOnSubscriptionsChangedListener =
		new OnSubscriptionsChangedListener() {
		private final DctOnSubscriptionsChangedListener
		mOnSubscriptionsChangedListener = new DctOnSubscriptionsChangedListener();

		private class DctOnSubscriptionsChangedListener extends OnSubscriptionsChangedListener {
		public final AtomicInteger mPreviousSubId =
		new AtomicInteger(SubscriptionManager.INVALID_SUBSCRIPTION_ID);

		@@ -295,8 +297,8 @@ public class DcTracker extends Handler {
		if (SubscriptionManager.isValidSubscriptionId(subId)) {
		registerSettingsObserver();
		}
		if (mPreviousSubId.getAndSet(subId) != subId &&
		SubscriptionManager.isValidSubscriptionId(subId)) {
		if (SubscriptionManager.isValidSubscriptionId(subId) &&
		mPreviousSubId.getAndSet(subId) != subId) {
		onRecordsLoadedOrSubIdChanged();
		}
		}
		@@ -2287,6 +2289,8 @@ public class DcTracker extends Handler {
		mAutoAttachOnCreationConfig = false;
		// Clear auto attach as modem is expected to do a new attach once SIM is ready
		mAutoAttachOnCreation.set(false);
		mOnSubscriptionsChangedListener.mPreviousSubId.set(
		SubscriptionManager.INVALID_SUBSCRIPTION_ID);
		}

		public void setPolicyDataEnabled(boolean enabled) {