commit 3f66cf11564e236a3f214a3a67ef9cdf38797b1f
author Tomasz Wasilczyk <twasilczyk@google.com> Thu Jul 25 10:07:05 2024 -0700
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Fri Aug 02 05:15:16 2024 +0000
tree f96298bbb6ae5381b01a0edbcf0add1c07da4de2
parent 73a087f5dd128618c9dcdf8ee94869cdbed670af

Avoid crash when checking if EuiccManager is enabled

Bug: 347624913
Test: android.carrierapi.cts.CarrierApiTest#testAddSubscriptionToExistingGroupForEsim
(cherry picked from https://android-review.googlesource.com/q/commit:f5fb983f8464fd444e51273e84dd6fca5c4872a3)
Merged-In: I918f6562949e32d3581bf0a69c9bfe02dce1cd3b
Change-Id: I918f6562949e32d3581bf0a69c9bfe02dce1cd3b

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

diff --git a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
index 0e98a9e..2125f45 100644
--- a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
+++ b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
@@ -2220,7 +2220,7 @@
     @Override
     public List<SubscriptionInfo> getAccessibleSubscriptionInfoList(
             @NonNull String callingPackage) {
-        if (!mEuiccManager.isEnabled()) {
+        if (mEuiccManager == null || !mEuiccManager.isEnabled()) {
             return null;
         }