commit b2a466d92fd5cb17a050259ba6e9be3798da450e
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 06 23:54:40 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 06 23:54:40 2022 +0000
tree 1695420ceb98f7fc53eac52616f7942219bdd102
parent a512817aba5c3ccda01bff41159a53d6b29b97ce
parent 0b9a6304aa4cb13566c830df8238f03aac3d1779

Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page"

src/com/android/settings/sim/PreferredSimDialogFragment.java

diff --git a/src/com/android/settings/sim/PreferredSimDialogFragment.java b/src/com/android/settings/sim/PreferredSimDialogFragment.java
index 806e04b..2bfeafe 100644
--- a/src/com/android/settings/sim/PreferredSimDialogFragment.java
+++ b/src/com/android/settings/sim/PreferredSimDialogFragment.java
@@ -91,6 +91,7 @@
         if (dialog == null) {
             Log.d(TAG, "Dialog is null.");
             dismiss();
+            return;
         }
 
         final SubscriptionInfo info = getPreferredSubscription();