From 56a88885ccc383269f02a49fff6bb503ed35c9d8 Mon Sep 17 00:00:00 2001
From: Weng Su <wengsu@google.com>
Date: Tue, 6 Jul 2021 11:30:17 +0800
Subject: [PATCH 1/4] Add comment to AndroidManifest

- Wi-Fi result data will only be returned from WifiDialogActivity if the
calling package has location permission.

Test: add comment only, no test required.
Bug: 185126813
Change-Id: I81c4d801c4ee211f43a1688a62daaff3b47eae1a
---
 AndroidManifest.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4d169c561fe..cf43731830d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2966,6 +2966,10 @@
             </intent-filter>
         </activity>
 
+        <!--
+            The Wi-Fi result data will only be returned from WifiDialogActivity if the calling
+            package has ACCESS_COARSE_LOCATION or ACCESS_FINE_LOCATION permission. (see b/185126813)
+        -->
         <activity
             android:name=".wifi.WifiDialogActivity"
             android:label=""

From 3cb889fc781d66f003017beb09f8b8c126f54d27 Mon Sep 17 00:00:00 2001
From: jasonwshsu <jasonwshsu@google.com>
Date: Mon, 5 Jul 2021 10:07:49 +0800
Subject: [PATCH 2/4] Fix accessibility button footer preference did not
 announced correct by TalkBack

Root Cause: Description would be altered after displayPreference(), but getSummary() would be called after it.

Solution: Update title before displayPreference(), then it could be set correctly.

Fix: 192738520
Test: atest AccessibilityButtonFooterPreferenceControllerTest
Change-Id: I068994fca8202b166fedf43f9d9657b0c1a64c4e
---
 res/xml/accessibility_button_settings.xml     |  1 +
 ...ilityButtonFooterPreferenceController.java | 17 ++++++++---
 ...yButtonFooterPreferenceControllerTest.java | 30 +++++++++----------
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/res/xml/accessibility_button_settings.xml b/res/xml/accessibility_button_settings.xml
index 78d13ab1a8d..02b1c7d4693 100644
--- a/res/xml/accessibility_button_settings.xml
+++ b/res/xml/accessibility_button_settings.xml
@@ -61,6 +61,7 @@
 
     <com.android.settings.accessibility.AccessibilityFooterPreference
         android:key="accessibility_button_footer"
+        android:title="@string/accessibility_button_description"
         android:persistent="false"
         android:selectable="false"
         settings:searchable="false"
diff --git a/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java
index 8b4a364a393..de90374c393 100644
--- a/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java
+++ b/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java
@@ -18,6 +18,8 @@ package com.android.settings.accessibility;
 
 import android.content.Context;
 
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.R;
 
 /**
@@ -36,9 +38,16 @@ public class AccessibilityButtonFooterPreferenceController extends
     }
 
     @Override
-    public CharSequence getSummary() {
-        return AccessibilityUtil.isGestureNavigateEnabled(mContext)
-                ? mContext.getString(R.string.accessibility_button_gesture_description)
-                : mContext.getString(R.string.accessibility_button_description);
+    public void displayPreference(PreferenceScreen screen) {
+        // Need to update footerPreference's data before super.displayPreference(), then it will use
+        // data to update related property of footerPreference.
+        if (AccessibilityUtil.isGestureNavigateEnabled(mContext)) {
+            final AccessibilityFooterPreference footerPreference =
+                    screen.findPreference(getPreferenceKey());
+            footerPreference.setTitle(
+                    mContext.getString(R.string.accessibility_button_gesture_description));
+        }
+
+        super.displayPreference(screen);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java
index 33c57625860..010b444f914 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.accessibility;
 
-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -26,6 +25,7 @@ import static org.mockito.Mockito.when;
 import android.content.Context;
 import android.content.res.Resources;
 
+import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
@@ -34,6 +34,7 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
@@ -50,30 +51,29 @@ public class AccessibilityButtonFooterPreferenceControllerTest {
     private final Context mContext = ApplicationProvider.getApplicationContext();
     @Spy
     private final Resources mResources = mContext.getResources();
+    @Mock
+    private PreferenceScreen mScreen;
     private AccessibilityButtonFooterPreferenceController mController;
+    private AccessibilityFooterPreference mPreference;
 
     @Before
     public void setUp() {
-        mController = new AccessibilityButtonFooterPreferenceController(mContext,
-                "test_key");
+        mController = new AccessibilityButtonFooterPreferenceController(mContext, "test_key");
+        mPreference = new AccessibilityFooterPreference(mContext);
+        mPreference.setKey("test_key");
+
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         when(mContext.getResources()).thenReturn(mResources);
     }
 
     @Test
-    public void getSummary_navigationGestureEnabled_shouldReturnButtonAndGestureSummary() {
+    public void displayPreference_navigationGestureEnabled_setCorrectTitle() {
         when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
-                    .thenReturn(NAV_BAR_MODE_GESTURAL);
+                .thenReturn(NAV_BAR_MODE_GESTURAL);
 
-        assertThat(mController.getSummary()).isEqualTo(
+        mController.displayPreference(mScreen);
+
+        assertThat(mPreference.getTitle()).isEqualTo(
                 mContext.getText(R.string.accessibility_button_gesture_description));
     }
-
-    @Test
-    public void getSummary_navigationGestureDisabled_shouldReturnButtonSummary() {
-        when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
-                .thenReturn(NAV_BAR_MODE_2BUTTON);
-
-        assertThat(mController.getSummary()).isEqualTo(
-                mContext.getText(R.string.accessibility_button_description));
-    }
 }

From e18c419f9417e3b21939dfb1246abc5b8d38df2f Mon Sep 17 00:00:00 2001
From: menghanli <menghanli@google.com>
Date: Mon, 5 Jul 2021 19:52:22 +0800
Subject: [PATCH 3/4] =?UTF-8?q?Fix=20toggle=20display=20and=20preferen=20s?=
 =?UTF-8?q?tyle=20old=20style=20and=20barely=20seen=20in=20=E2=80=9CVision?=
 =?UTF-8?q?=20Settings=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Root cause: Apply ThemeHelper.trySetDynamicColor would overlay the
settings style.
Solution: Create SudDynamicColorThemeSettings.SetupWizard to support
dynamicColor and settings style.

Bug: 192410829
Test: manual test
Change-Id: Ic196dfe417e7f804c68ed4ea7bc05b4716999bcf
---
 res/values/themes_suw.xml                      | 18 ++++++++++++++++++
 ...sibilitySettingsForSetupWizardActivity.java | 14 ++++++++++++--
 .../settings/core/SettingsBaseActivity.java    | 13 ++++++++++---
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index d7b4ca06b67..067ddfb558c 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -223,6 +223,24 @@
     <!-- This theme was applied to Settings pages which are running under SUW. -->
     <style name="SubSettings.SetupWizard" parent="SudThemeGlifV3.Light" />
 
+    <!-- This theme was applied to Settings pages which are running under SUW with DynamicColor. -->
+    <style name="SudDynamicColorThemeSettings.SetupWizard" parent="SudDynamicColorThemeGlifV3.Light">
+        <item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle.SettingsLib</item>
+        <item name="android:listPreferredItemPaddingStart">24dp</item>
+        <item name="android:listPreferredItemPaddingEnd">16dp</item>
+        <item name="preferenceTheme">@style/PreferenceTheme.SettingsLib</item>
+        <item name="android:switchStyle">@style/Switch.SettingsLib</item>
+    </style>
+
+    <!-- This theme was applied to Settings pages which are running under SUW with DynamicColor. -->
+    <style name="SudDynamicColorThemeSettings.SetupWizard.DayNight" parent="SudDynamicColorThemeGlifV3.DayNight">
+        <item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle.SettingsLib</item>
+        <item name="android:listPreferredItemPaddingStart">24dp</item>
+        <item name="android:listPreferredItemPaddingEnd">16dp</item>
+        <item name="preferenceTheme">@style/PreferenceTheme.SettingsLib</item>
+        <item name="android:switchStyle">@style/Switch.SettingsLib</item>
+    </style>
+
     <!-- DayNight themes -->
     <style name="GlifTheme.DayNight" parent="GlifTheme.Light" />
     <style name="GlifV2Theme.DayNight" parent="GlifV2Theme.Light" />
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index 48b3992b685..b65b349707c 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -101,12 +101,22 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit
     @Override
     protected void onCreate(Bundle savedState) {
         super.onCreate(savedState);
-        setTheme(SetupWizardUtils.getTheme(this, getIntent()));
-        ThemeHelper.trySetDynamicColor(this);
+        applyTheme();
         tryLaunchFontSizeSettings();
         findViewById(R.id.content_parent).setFitsSystemWindows(false);
     }
 
+    private void applyTheme() {
+        if (ThemeHelper.trySetDynamicColor(this)) {
+            final int appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)
+                    ? R.style.SudDynamicColorThemeSettings_SetupWizard_DayNight
+                    : R.style.SudDynamicColorThemeSettings_SetupWizard;
+            setTheme(appliedTheme);
+        } else {
+            setTheme(SetupWizardUtils.getTheme(this, getIntent()));
+        }
+    }
+
     @VisibleForTesting
     void tryLaunchFontSizeSettings() {
         if (WizardManagerHelper.isAnySetupWizard(getIntent())
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index e8a7f36908a..ceb502ae327 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -91,10 +91,17 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
         // Apply SetupWizard light theme during setup flow. This is for SubSettings pages.
         final boolean isAnySetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
         if (isAnySetupWizard && this instanceof SubSettings) {
-            final int appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)
-                    ? R.style.SubSettings_SetupWizard : R.style.SudThemeGlifV3_Light;
+            int appliedTheme;
+            if (ThemeHelper.trySetDynamicColor(this)) {
+                appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)
+                        ? R.style.SudDynamicColorThemeSettings_SetupWizard_DayNight
+                        : R.style.SudDynamicColorThemeSettings_SetupWizard;
+            } else {
+                appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)
+                        ? R.style.SubSettings_SetupWizard
+                        : R.style.SudThemeGlifV3_Light;
+            }
             setTheme(appliedTheme);
-            ThemeHelper.trySetDynamicColor(this);
         }
 
         if (isToolbarEnabled() && !isAnySetupWizard) {

From e530d93382db30d0e8249936dfb8f20b91ebc0b0 Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Thu, 17 Jun 2021 11:18:14 +0800
Subject: [PATCH 4/4] [Settings] fix for Wifi calling settings page crash

UI crash reported due to accessing telephony framework API with invalid
subscription ID from SIM. Which comes with multiple reason.

Besides of avoidance of crash, following updates are also required:
1. Close wifi calling settings UI when pSIM or eSIM not available or
inserted.
2. Keep the selection of tab (under multi-SIM) when screen rotate
3. Only show 1 SIM when multi-SIM are grouped together

Bug: 149190278
Test: local
Change-Id: Ied9a088b6ee5da66972f27649cc07f4a31304f17
(cherry picked from commit fbe1293a54a84e0e835dc418a131b4c30799a2ae)
(cherry picked from commit 05f29efe341af57904f0f12fc13ad488555fbf53)
---
 .../telephony/MobileNetworkActivity.java      |  10 +
 .../wifi/calling/WifiCallingSettings.java     | 171 +++++++++++++++---
 2 files changed, 155 insertions(+), 26 deletions(-)

diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
index 20b37c14834..f2be37fa985 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
@@ -36,6 +36,7 @@ import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.Lifecycle;
 
 import com.android.internal.util.CollectionUtils;
 import com.android.settings.R;
@@ -68,6 +69,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity
     // Set initial value to true allows subscription information fragment to be re-created when
     // Activity re-create occur.
     private boolean mFragmentForceReload = true;
+    private boolean mPendingSubscriptionChange = false;
 
     @Override
     protected void onNewIntent(Intent intent) {
@@ -155,6 +157,10 @@ public class MobileNetworkActivity extends SettingsBaseActivity
      * Implementation of ProxySubscriptionManager.OnActiveSubscriptionChangedListener
      */
     public void onChanged() {
+        if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) {
+            mPendingSubscriptionChange = true;
+            return;
+        }
         SubscriptionInfo info = getSubscription();
         int oldSubIndex = mCurSubscriptionId;
         updateSubscriptions(info, null);
@@ -180,6 +186,10 @@ public class MobileNetworkActivity extends SettingsBaseActivity
         super.onStart();
         // updateSubscriptions doesn't need to be called, onChanged will always be called after we
         // register a listener.
+        if (mPendingSubscriptionChange) {
+            mPendingSubscriptionChange = false;
+            onChanged();
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettings.java b/src/com/android/settings/wifi/calling/WifiCallingSettings.java
index 86e7e8da670..25508f73caf 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSettings.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSettings.java
@@ -17,6 +17,7 @@
 package com.android.settings.wifi.calling;
 
 import android.app.settings.SettingsEnums;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -29,12 +30,14 @@ import android.view.ViewGroup;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 
 import com.android.internal.util.CollectionUtils;
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.network.ActiveSubscriptionsListener;
 import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.network.ims.WifiCallingQueryImsState;
 import com.android.settings.search.actionbar.SearchMenuController;
@@ -42,6 +45,9 @@ import com.android.settings.support.actionbar.HelpResourceProvider;
 import com.android.settings.widget.RtlCompatibleViewPager;
 import com.android.settings.widget.SlidingTabLayout;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -50,7 +56,10 @@ import java.util.List;
  */
 public class WifiCallingSettings extends InstrumentedFragment implements HelpResourceProvider {
     private static final String TAG = "WifiCallingSettings";
+    private int mConstructionSubId;
     private List<SubscriptionInfo> mSil;
+    private ActiveSubscriptionsListener mSubscriptionChangeListener;
+    private static final int [] EMPTY_SUB_ID_LIST = new int[0];
 
     //UI objects
     private RtlCompatibleViewPager mViewPager;
@@ -95,16 +104,26 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
         return view;
     }
 
+    private int getConstructionSubId(Bundle bundle) {
+        int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+
+        Intent intent = getActivity().getIntent();
+        if (intent != null) {
+            subId = intent.getIntExtra(Settings.EXTRA_SUB_ID,
+                    SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        }
+        if ((subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) && (bundle != null)) {
+            subId = bundle.getInt(Settings.EXTRA_SUB_ID,
+                    SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        }
+        return subId;
+    }
+
     private void maybeSetViewForSubId() {
         if (mSil == null) {
             return;
         }
-        final Intent intent = getActivity().getIntent();
-        if (intent == null) {
-            return;
-        }
-        final int subId = intent.getIntExtra(Settings.EXTRA_SUB_ID,
-                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        int subId = mConstructionSubId;
         if (SubscriptionManager.isValidSubscriptionId(subId)) {
             for (SubscriptionInfo subInfo : mSil) {
                 if (subId == subInfo.getSubscriptionId()) {
@@ -117,11 +136,15 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
 
     @Override
     public void onCreate(Bundle icicle) {
+        mConstructionSubId = getConstructionSubId(icicle);
         super.onCreate(icicle);
+        Log.d(TAG, "SubId=" + mConstructionSubId);
 
-        // TODO: besides in onCreate, we should also update subList when SIM / Sub status
-        // changes.
-        updateSubList();
+        if (mConstructionSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            // Only config Wfc if it's enabled by platform.
+            mSubscriptionChangeListener = getSubscriptionChangeListener(getContext());
+        }
+        mSil = updateSubList();
     }
 
     @Override
@@ -135,6 +158,26 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
         }
 
         updateTitleForCurrentSub();
+
+        if (mSubscriptionChangeListener != null) {
+            mSubscriptionChangeListener.start();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        if (mSubscriptionChangeListener != null) {
+            mSubscriptionChangeListener.stop();
+        }
+
+        super.onStop();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        // keep subscription ID for recreation
+        outState.putInt(Settings.EXTRA_SUB_ID, mConstructionSubId);
     }
 
     @Override
@@ -160,11 +203,11 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
 
         @Override
         public Fragment getItem(int position) {
-            Log.d(TAG, "Adapter getItem " + position);
+            int subId = mSil.get(position).getSubscriptionId();
+            Log.d(TAG, "Adapter getItem " + position + " for subId=" + subId);
             final Bundle args = new Bundle();
             args.putBoolean(SearchMenuController.NEED_SEARCH_ICON_IN_ACTION_BAR, false);
-            args.putInt(WifiCallingSettingsForSub.FRAGMENT_BUNDLE_SUBID,
-                    mSil.get(position).getSubscriptionId());
+            args.putInt(WifiCallingSettingsForSub.FRAGMENT_BUNDLE_SUBID, subId);
             final WifiCallingSettingsForSub fragment = new WifiCallingSettingsForSub();
             fragment.setArguments(args);
 
@@ -190,22 +233,27 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
         }
     }
 
-    private void updateSubList() {
-        mSil = SubscriptionUtil.getActiveSubscriptions(
-                getContext().getSystemService(SubscriptionManager.class));
+    @VisibleForTesting
+    protected List<SubscriptionInfo> getSelectableSubscriptions(Context context) {
+        return SubscriptionUtil.getSelectableSubscriptionInfoList(context);
+    }
 
-        // Only config Wfc if it's enabled by platform.
-        if (mSil == null) {
-            return;
+    private List<SubscriptionInfo> updateSubList() {
+        List<SubscriptionInfo> subInfoList = getSelectableSubscriptions(getContext());
+
+        if (subInfoList == null) {
+            return Collections.emptyList();
         }
-        for (int i = 0; i < mSil.size(); ) {
-            final SubscriptionInfo info = mSil.get(i);
-            if (!queryImsState(info.getSubscriptionId()).isWifiCallingProvisioned()) {
-                mSil.remove(i);
-            } else {
-                i++;
-            }
+        List<SubscriptionInfo> selectedList = new ArrayList<SubscriptionInfo>();
+        for (SubscriptionInfo subInfo : subInfoList) {
+            int subId = subInfo.getSubscriptionId();
+            try {
+                if (queryImsState(subId).isWifiCallingProvisioned()) {
+                    selectedList.add(subInfo);
+                }
+            } catch (Exception exception) {}
         }
+        return selectedList;
     }
 
     private void updateTitleForCurrentSub() {
@@ -218,7 +266,78 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
     }
 
     @VisibleForTesting
-    WifiCallingQueryImsState queryImsState(int subId) {
+    protected WifiCallingQueryImsState queryImsState(int subId) {
         return new WifiCallingQueryImsState(getContext(), subId);
     }
+
+    @VisibleForTesting
+    protected ActiveSubscriptionsListener getSubscriptionChangeListener(Context context) {
+        return new ActiveSubscriptionsListener(context.getMainLooper(), context) {
+            public void onChanged() {
+                onSubscriptionChange(context);
+            }
+        };
+    }
+
+    protected void onSubscriptionChange(Context context) {
+        if (mSubscriptionChangeListener == null) {
+            return;
+        }
+        int [] previousSubIdList = subscriptionIdList(mSil);
+        List<SubscriptionInfo> updateList = updateSubList();
+        int [] currentSubIdList = subscriptionIdList(updateList);
+
+        if (currentSubIdList.length > 0) {
+            // only keep fragment when any provisioned subscription is available
+            if (previousSubIdList.length == 0) {
+                // initial loading of list
+                mSil = updateList;
+                return;
+            }
+            if (previousSubIdList.length == currentSubIdList.length) {
+                // same number of subscriptions
+                if ( (!containsSubId(previousSubIdList, mConstructionSubId))
+                        // original request not yet appears in list
+                        || containsSubId(currentSubIdList, mConstructionSubId) )
+                        // original request appears in list
+                {
+                    mSil = updateList;
+                    return;
+                }
+            }
+        }
+        Log.d(TAG, "Closed subId=" + mConstructionSubId
+                + " due to subscription change: " + Arrays.toString(previousSubIdList)
+                + " -> " + Arrays.toString(currentSubIdList));
+
+        // close this fragment when no provisioned subscriptions available
+        if (mSubscriptionChangeListener != null) {
+            mSubscriptionChangeListener.stop();
+            mSubscriptionChangeListener = null;
+        }
+
+        // close this fragment
+        finish();
+    }
+
+    protected void finish() {
+        FragmentActivity activity = getActivity();
+        if (activity == null) return;
+        if (getFragmentManager().getBackStackEntryCount() > 0) {
+            getFragmentManager().popBackStack();
+        } else {
+            activity.finish();
+        }
+    }
+
+    protected int [] subscriptionIdList(List<SubscriptionInfo> subInfoList) {
+        return (subInfoList == null) ? EMPTY_SUB_ID_LIST :
+                subInfoList.stream().mapToInt(subInfo -> (subInfo == null) ?
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID : subInfo.getSubscriptionId())
+                .toArray();
+    }
+
+    protected boolean containsSubId(int [] subIdArray, int subIdLookUp) {
+        return Arrays.stream(subIdArray).anyMatch(subId -> (subId == subIdLookUp));
+    }
 }