commit 77d25b956e47477efc23b03eb1ceb507160afbe2
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Mar 08 03:07:13 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 08 03:07:13 2024 +0000
tree 9f6e5c4666b4fd2ec393c720856d0bb7aa82479f
parent 159ea42a0fa8fb5a1f322d84a78dc0075d83653e
parent 507bef6d58003b7bc6c2ceea6c942c6c6406f0e0

Merge "Add null check for EuiccManager" into main

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;
         }