From 2d5a231a46e4f3fe94609cfddb6703231d1d422a Mon Sep 17 00:00:00 2001 From: songferngwang Date: Tue, 11 Feb 2025 02:26:46 +0000 Subject: [PATCH] Handle the sim switch for restricted ss mode case The restricted ss mode case is the device lock the sim switch function in the single sim mode. For this case, UI did not use sim onboarding flow, and use the sim switch dialog. Bug: 393151990 Test: verify the sim switch function in the restricted ss mode. Flag: EXEMPT bugfix Change-Id: I04439f254010052c78a702618d972a9cf54cece0 --- src/com/android/settings/network/SimOnboardingActivity.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/network/SimOnboardingActivity.kt b/src/com/android/settings/network/SimOnboardingActivity.kt index 6d9800b5c5a..5d21c0fb3cd 100644 --- a/src/com/android/settings/network/SimOnboardingActivity.kt +++ b/src/com/android/settings/network/SimOnboardingActivity.kt @@ -122,9 +122,10 @@ class SimOnboardingActivity : SpaBaseDialogActivity() { return } - if (onboardingService.activeSubInfoList.isEmpty()) { + if (onboardingService.activeSubInfoList.isEmpty() + || (!onboardingService.isMultiSimEnabled && !onboardingService.isMultiSimSupported)) { // TODO: refactor and replace the ToggleSubscriptionDialogActivity - Log.d(TAG, "onboardingService.activeSubInfoList is empty" + + Log.d(TAG, "onboardingService.activeSubInfoList is empty or restricted ss mode " + ", start ToggleSubscriptionDialogActivity") this.startActivity(ToggleSubscriptionDialogActivity .getIntent(this.applicationContext, targetSubId, true))