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

Commit af5bbc50 authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

Merge "Modify the condition for hide Dds confirmed dialog" into main

parents e5302bc1 b8d87d1a

src/com/android/settings/network/SimOnboardingActivity.kt

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ class SimOnboardingActivity : SpaBaseDialogActivity() { 


        if (onboardingService.activeSubInfoList.isEmpty()) {

            // TODO: refactor and replace the ToggleSubscriptionDialogActivity

            Log.e(TAG, "onboardingService.activeSubInfoList is empty" +

            Log.d(TAG, "onboardingService.activeSubInfoList is empty" +

                    ", start ToggleSubscriptionDialogActivity")

            this.startActivity(ToggleSubscriptionDialogActivity

                    .getIntent(this.applicationContext, targetSubId, true))

src/com/android/settings/sim/SimDialogActivity.java

+1 −3
Original line number Diff line number Diff line
@@ -136,9 +136,7 @@ public class SimDialogActivity extends FragmentActivity { 
        }



        if (Flags.isDualSimOnboardingEnabled()

                && getProgressState() == SubscriptionActionDialogActivity.PROGRESS_IS_SHOWING

                && (dialogType == PREFERRED_PICK

                || dialogType == DATA_PICK

                && (dialogType == DATA_PICK

                || dialogType == CALLS_PICK

                || dialogType == SMS_PICK)) {

            Log.d(TAG, "Finish the sim dialog since the sim onboarding is shown");