Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34dac9cb authored by SongFerngWang's avatar SongFerngWang Committed by Android Build Coastguard Worker
Browse files

[MEP] Hide the preferred SIM dialog when the user has replaced the SIM 

Since there is the race condition and it causes UI hides the preferred
SIM dialog. Therefore, to hide the preferred SIM dialog under the
specific condition which the user has replaced the SIM during the
SIM switching.

Bug: 238061853
Test: Manually testing. Device has the psim+esim and the esim's mobile
data on. The tester disables the esim and then UI shows the preferred
SIM dialog.

Change-Id: I01e7d60170c5053730fd3113abd914fb5c0d11c9
(cherry picked from commit 286dce6b)
Merged-In: I01e7d60170c5053730fd3113abd914fb5c0d11c9
parent 8cef0681

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

+13 −1
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -220,8 +220,8 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc 
                showProgressDialog(

                        getString(

                                R.string.sim_action_switch_sub_dialog_progress,

                                SubscriptionUtil.getUniqueSubscriptionDisplayName(

                                        mSubInfo, this)));

                                SubscriptionUtil.getUniqueSubscriptionDisplayName(mSubInfo, this)),

                        removedSubInfo != null ? true : false);

                if (mIsEsimOperation) {

                    mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId(),

                            UiccSlotUtil.INVALID_PORT_ID,