Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a796508a authored by Charlotte Lu's avatar Charlotte Lu Committed by Android (Google) Code Review
Browse files

Merge "Java crash - AID_SYSTEM_USER - SimListDialogFragment.updateDialog -... 

Merge "Java crash - AID_SYSTEM_USER - SimListDialogFragment.updateDialog - java.lang.NullPointerException." into main
parents 6bb80b42 9540e600

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -56,7 +56,8 @@ public class SimListDialogFragment extends SimDialogFragment { 




    protected SelectSubscriptionAdapter mAdapter;

    protected SelectSubscriptionAdapter mAdapter;

    @VisibleForTesting

    @VisibleForTesting

    List<SubscriptionInfo> mSubscriptions;

    @NonNull

    List<SubscriptionInfo> mSubscriptions = new ArrayList<>();





    public static SimListDialogFragment newInstance(int dialogType, int titleResId,

    public static SimListDialogFragment newInstance(int dialogType, int titleResId,

            boolean includeAskEveryTime, boolean isCancelItemShowed) {

            boolean includeAskEveryTime, boolean isCancelItemShowed) {
@@ -71,8 +72,6 @@ public class SimListDialogFragment extends SimDialogFragment { 
    @NonNull

    @NonNull

    @Override

    @Override

    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

        mSubscriptions = new ArrayList<>();



        final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());

        final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());

        View titleView = LayoutInflater.from(getContext()).inflate(

        View titleView = LayoutInflater.from(getContext()).inflate(

                R.layout.sim_confirm_dialog_title_multiple_enabled_profiles_supported, null);

                R.layout.sim_confirm_dialog_title_multiple_enabled_profiles_supported, null);