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

Commit 35b5d41d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix crash on potentially missing EuiccManager" into main

parents b1e1e290 b27c9b50

src/com/android/settings/MainClear.java

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis 
    @VisibleForTesting

    protected boolean isEuiccEnabled(Context context) {

        EuiccManager euiccManager = (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);

        return euiccManager.isEnabled();

        return euiccManager != null && euiccManager.isEnabled();

    }



    @VisibleForTesting

src/com/android/settings/ResetNetwork.java

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ public class ResetNetwork extends InstrumentedFragment { 
        }

        EuiccManager euiccManager =

                (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);

        if (!euiccManager.isEnabled()) {

        if (euiccManager == null || !euiccManager.isEnabled()) {

            return false;

        }

        ContentResolver resolver = context.getContentResolver();

src/com/android/settings/network/telephony/MobileNetworkUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ public class MobileNetworkUtils { 
    public static Boolean showEuiccSettingsDetecting(Context context) {

        final EuiccManager euiccManager =

                (EuiccManager) context.getSystemService(EuiccManager.class);

        if (!euiccManager.isEnabled()) {

        if (euiccManager == null || !euiccManager.isEnabled()) {

            Log.w(TAG, "EuiccManager is not enabled.");

            return false;

        }