commit | 1a0c26dd7ec04844ae8fcef04ab5f22390351d09 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Sep 06 13:59:59 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 06 13:59:59 2022 +0000 |
tree | 8296595366fb636772543ad0da830ecd99d41af2 | |
parent | 47b3d752e7138161f8cb983de45836582c09d1d5 [diff] | |
parent | 140d3355715cf355cee140158155a5b675d68e95 [diff] |
Merge "Crash in PreferredSimDialogFragment" am: a512817aba am: 42cc405781 am: a4915b26f4 am: 140d335571 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207096 Change-Id: I3b2652dfe7abb46558109033328de07011cd0594 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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();