Merge "The pages of sim onboarding flow is wrong." into main

2024-05-28 19:58:55 +00:00
parent 7b986e7e45 98efa51681
commit b462f9fa11
4 changed files with 42 additions and 20 deletions
--- a/src/com/android/settings/spa/network/SimOnboardingPageProvider.kt
+++ b/src/com/android/settings/spa/network/SimOnboardingPageProvider.kt
@@ -107,7 +107,8 @@ fun PageImpl(onboardingService:SimOnboardingService,navHostController: NavHostCo
        composable(route = SimOnboardingScreen.LabelSim.name) {
            val nextPage =
                if (onboardingService.isMultipleEnabledProfilesSupported
-                            && onboardingService.isAllOfSlotAssigned) {
+                        && onboardingService.isAllOfSlotAssigned
+                        && !onboardingService.doesTargetSimActive) {
                    SimOnboardingScreen.SelectSim.name
                } else {
                    LaunchedEffect(Unit) {