From 4ded4ac03867a3dff9119279c1247afa2152fc23 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Mon, 23 Sep 2024 12:09:00 +0800 Subject: [PATCH] Check canEnterMobileNetworkPage When startSimOnboardingActivity, so we enforce the no_config_mobile_networks when insert psim. Fix: 366370519 Flag: EXEMPT bug fix Test: manual - set no_config_mobile_networks and insert psim Change-Id: I0d4e85262924cc55a035ebeb2038ae08c0052ef6 --- src/com/android/settings/network/SimOnboardingActivity.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/network/SimOnboardingActivity.kt b/src/com/android/settings/network/SimOnboardingActivity.kt index 25afb661e8b..7fab9c9848e 100644 --- a/src/com/android/settings/network/SimOnboardingActivity.kt +++ b/src/com/android/settings/network/SimOnboardingActivity.kt @@ -53,8 +53,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.lifecycle.LifecycleRegistry import com.android.settings.R import com.android.settings.SidecarFragment +import com.android.settings.network.telephony.SimRepository import com.android.settings.network.telephony.SubscriptionActionDialogActivity -import com.android.settings.network.telephony.SubscriptionRepository import com.android.settings.network.telephony.ToggleSubscriptionDialogActivity import com.android.settings.network.telephony.requireSubscriptionManager import com.android.settings.spa.SpaActivity.Companion.startSpaActivity @@ -578,6 +578,10 @@ class SimOnboardingActivity : SpaBaseDialogActivity() { subId: Int, isNewTask: Boolean = false, ) { + if (!SimRepository(context).canEnterMobileNetworkPage()) { + Log.i(TAG, "Unable to start SimOnboardingActivity due to missing permissions") + return + } val intent = Intent(context, SimOnboardingActivity::class.java).apply { putExtra(SUB_ID, subId) if(isNewTask) {