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

Merge "Modify the condition for hide Dds confirmed dialog" into main

Browse Source
This commit is contained in:
SongFerng Wang
2024-02-29 11:27:05 +00:00
committed by Android (Google) Code Review
parent e5302bc1f1 b8d87d1add
commit af5bbc5087
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,7 +102,7 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
if (onboardingService.activeSubInfoList.isEmpty()) { if (onboardingService.activeSubInfoList.isEmpty()) {
// TODO: refactor and replace the ToggleSubscriptionDialogActivity // TODO: refactor and replace the ToggleSubscriptionDialogActivity
Log.e(TAG, "onboardingService.activeSubInfoList is empty" + Log.d(TAG, "onboardingService.activeSubInfoList is empty" +
", start ToggleSubscriptionDialogActivity") ", start ToggleSubscriptionDialogActivity")
this.startActivity(ToggleSubscriptionDialogActivity this.startActivity(ToggleSubscriptionDialogActivity
.getIntent(this.applicationContext, targetSubId, true)) .getIntent(this.applicationContext, targetSubId, true))

4
src/com/android/settings/sim/SimDialogActivity.java
View File

@@ -136,9 +136,7 @@ public class SimDialogActivity extends FragmentActivity {
} }
if (Flags.isDualSimOnboardingEnabled() if (Flags.isDualSimOnboardingEnabled()
&& getProgressState() == SubscriptionActionDialogActivity.PROGRESS_IS_SHOWING && (dialogType == DATA_PICK
&& (dialogType == PREFERRED_PICK
|| dialogType == DATA_PICK
|| dialogType == CALLS_PICK || dialogType == CALLS_PICK
|| dialogType == SMS_PICK)) { || dialogType == SMS_PICK)) {
Log.d(TAG, "Finish the sim dialog since the sim onboarding is shown"); Log.d(TAG, "Finish the sim dialog since the sim onboarding is shown");