commit 507bef6d58003b7bc6c2ceea6c942c6c6406f0e0
author Tomasz Wasilczyk <twasilczyk@google.com> Thu Mar 07 09:33:59 2024 -0800
committer Tomasz Wasilczyk <twasilczyk@google.com> Thu Mar 07 09:33:59 2024 -0800
tree f83d0c069bb2d9ff0064ba937da56e6c29dd0538
parent d1a97399eba724b51e5bd67641f3570d58a3c153

Add null check for EuiccManager

Bug: 310710841
Test: it builds
Change-Id: Ib2966af74300223f7fd2306ad09504b941576f15

src/com/android/phone/euicc/EuiccUiDispatcherActivity.java

diff --git a/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java b/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java
index 5da52d6..3e44062 100644
--- a/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java
+++ b/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java
@@ -113,7 +113,7 @@
     @Nullable
     Intent resolveEuiccUiIntent() {
         EuiccManager euiccManager = (EuiccManager) getSystemService(Context.EUICC_SERVICE);
-        if (!euiccManager.isEnabled()) {
+        if (euiccManager == null || !euiccManager.isEnabled()) {
             Log.w(TAG, "eUICC not enabled");
             return null;
         }