Snap for 8813441 from 4a48dc5e96 to tm-qpr1-release

Change-Id: I3a434c64d80c0eb32739170dfd897202c026569c

src/com/android/settings/network/telephony/SubscriptionActionDialogActivity.java

@@ -60,9 +60,21 @@ public class SubscriptionActionDialogActivity extends FragmentActivity {
      * @param message The string content should be displayed in the progress dialog.
      */
     protected void showProgressDialog(String message) {
+        showProgressDialog(message,false);
+    }
+
+    /**
+     * Displays a loading dialog.
+     *
+     * @param message The string content should be displayed in the progress dialog.
+     * @param updateIfNeeded is whether to update the progress state in the SharedPreferences.
+     */
+    protected void showProgressDialog(String message, boolean updateIfNeeded) {
         ProgressDialogFragment.show(getFragmentManager(), message, null);
+        if (updateIfNeeded) {
             setProgressState(PROGRESS_IS_SHOWING);
         }
+    }
 
     /** Dismisses the loading dialog. */
     protected void dismissProgressDialog() {

src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java

@@ -220,8 +220,8 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
                 showProgressDialog(
                         getString(
                                 R.string.sim_action_switch_sub_dialog_progress,
-                                SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                                SubscriptionUtil.getUniqueSubscriptionDisplayName(mSubInfo, this)),
-                                        mSubInfo, this)));
+                        removedSubInfo != null ? true : false);
                 if (mIsEsimOperation) {
                     mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId(),
                             UiccSlotUtil.INVALID_PORT_ID,