Merge "Java crash - AID_SYSTEM_USER - SimListDialogFragment.updateDialog - java.lang.NullPointerException." into main
diff --git a/src/com/android/settings/sim/SimListDialogFragment.java b/src/com/android/settings/sim/SimListDialogFragment.java
index 5b84d7b..2763211 100644
--- a/src/com/android/settings/sim/SimListDialogFragment.java
+++ b/src/com/android/settings/sim/SimListDialogFragment.java
@@ -56,7 +56,8 @@
protected SelectSubscriptionAdapter mAdapter;
@VisibleForTesting
- List<SubscriptionInfo> mSubscriptions;
+ @NonNull
+ List<SubscriptionInfo> mSubscriptions = new ArrayList<>();
public static SimListDialogFragment newInstance(int dialogType, int titleResId,
boolean includeAskEveryTime, boolean isCancelItemShowed) {
@@ -71,8 +72,6 @@
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
- mSubscriptions = new ArrayList<>();
-
final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
View titleView = LayoutInflater.from(getContext()).inflate(
R.layout.sim_confirm_dialog_title_multiple_enabled_profiles_supported, null);