Merge "New System API to launch SIM Preference in Setting" into main

2024-12-04 01:31:58 +00:00
parent 70e95a24f2 2e7db438ab
commit 7975c1c217
2 changed files with 14 additions and 3 deletions
--- a/src/com/android/settings/network/SimOnboardingActivity.kt
+++ b/src/com/android/settings/network/SimOnboardingActivity.kt
@@ -109,6 +109,12 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
        }

        var targetSubId = intent.getIntExtra(SUB_ID,SubscriptionManager.INVALID_SUBSCRIPTION_ID)
+        if (targetSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            targetSubId = intent.getIntExtra(
+              Settings.EXTRA_SUB_ID,
+              SubscriptionManager.INVALID_SUBSCRIPTION_ID
+            )
+        }
        initServiceData(this, targetSubId, callbackListener)
        if (!onboardingService.isUsableTargetSubscriptionId) {
            Log.e(TAG, "The subscription id is not usable.")
@@ -608,4 +614,4 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
            CALLBACK_FINISH(5)
        }
    }
-}
+}