PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jin Jeong
2024-12-04 01:31:58 +00:00
committed by Android (Google) Code Review
parent 70e95a24f2 2e7db438ab
commit 7975c1c217
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
AndroidManifest.xml
View File

@@ -852,10 +852,15 @@
</activity>
<activity android:name=".network.SimOnboardingActivity"
android:exported="false"
android:exported="true"
android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"
android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
android:theme="@style/Theme.SpaLib.BottomSheetDialog"/>
android:theme="@style/Theme.SpaLib.BottomSheetDialog">
<intent-filter android:priority="1">
<action android:name="android.settings.SIM_PREFERENCE_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".network.telephony.ToggleSubscriptionDialogActivity"
android:exported="false"

6
src/com/android/settings/network/SimOnboardingActivity.kt
View File

@@ -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.")