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

Merge "Avoid the exception when UI shows the fragment" into udc-qpr-dev am: a94cfc7b76

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24098950

Change-Id: Iba6b9d6b453c7e0289fd4ad81391483084fab0e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
SongFerng Wang
2023-07-20 16:21:01 +00:00
committed by Automerger Merge Worker
parent 988568f64b a94cfc7b76
commit a4cac90c1d
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -280,8 +280,20 @@ public class SimDialogActivity extends FragmentActivity {
public void showEnableAutoDataSwitchDialog() {
final FragmentManager fragmentManager = getSupportFragmentManager();
SimDialogFragment fragment = createFragment(ENABLE_AUTO_DATA_SWITCH);
fragment.show(fragmentManager, Integer.toString(ENABLE_AUTO_DATA_SWITCH));
if (fragmentManager.isStateSaved()) {
Log.w(TAG, "Failed to show EnableAutoDataSwitchDialog. The fragmentManager "
+ "is StateSaved.");
forceClose();
return;
}
try {
fragment.show(fragmentManager, Integer.toString(ENABLE_AUTO_DATA_SWITCH));
} catch (Exception e) {
Log.e(TAG, "Failed to show EnableAutoDataSwitchDialog.", e);
forceClose();
return;
}
if (getResources().getBoolean(
R.bool.config_auto_data_switch_enables_cross_sim_calling)) {
// If auto data switch is already enabled on the non-DDS, the dialog for enabling it