From b27c9b507b3d2e9b971d6bf6fe50163c930e8e0b Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Thu, 7 Mar 2024 09:30:49 -0800 Subject: [PATCH] Fix crash on potentially missing EuiccManager Bug: 310710841 Test: it builds Change-Id: I9d2c88091a34a4e4e118fd1bd8d95c724c52e77e --- src/com/android/settings/MainClear.java | 2 +- src/com/android/settings/ResetNetwork.java | 2 +- .../android/settings/network/telephony/MobileNetworkUtils.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/MainClear.java b/src/com/android/settings/MainClear.java index 7b96d42b912..87b11f747a2 100644 --- a/src/com/android/settings/MainClear.java +++ b/src/com/android/settings/MainClear.java @@ -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 diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java index c33a4f826a0..642485a70f8 100644 --- a/src/com/android/settings/ResetNetwork.java +++ b/src/com/android/settings/ResetNetwork.java @@ -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(); diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java index 8a635051bdc..0407b6a7b66 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java +++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java @@ -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; }