Merge "Return when dialog is null" into main

This commit is contained in:
Treehugger Robot
2024-04-23 08:43:30 +00:00
committed by Android (Google) Code Review

View File

@@ -114,7 +114,7 @@ public class SelectSpecificDataSimDialogFragment extends SimDialogFragment imple
return getSubscriptionManager().getDefaultDataSubscriptionInfo(); return getSubscriptionManager().getDefaultDataSubscriptionInfo();
} }
private void updateDialog(AlertDialog dialog) { private void updateDialog(@Nullable AlertDialog dialog) {
Log.d(TAG, "Dialog updated, dismiss status: " + mWasDismissed); Log.d(TAG, "Dialog updated, dismiss status: " + mWasDismissed);
if (mWasDismissed) { if (mWasDismissed) {
return; return;
@@ -123,6 +123,7 @@ public class SelectSpecificDataSimDialogFragment extends SimDialogFragment imple
if (dialog == null) { if (dialog == null) {
Log.d(TAG, "Dialog is null."); Log.d(TAG, "Dialog is null.");
dismiss(); dismiss();
return;
} }
SubscriptionInfo currentDataSubInfo = getDefaultDataSubInfo(); SubscriptionInfo currentDataSubInfo = getDefaultDataSubInfo();