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

Commit a33c5553 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid crash when checking if EuiccManager is enabled" into main am: 3f0ec3f0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/3195381



Change-Id: Ic67a6c21db7c02220ebd45ab9c9edc5f03825c53
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ca41e8a6 3f0ec3f0

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

+1 −1
Original line number Diff line number Diff line
@@ -2220,7 +2220,7 @@ public class SubscriptionManagerService extends ISub.Stub { 
    @Override

    public List<SubscriptionInfo> getAccessibleSubscriptionInfoList(

            @NonNull String callingPackage) {

        if (!mEuiccManager.isEnabled()) {

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

            return null;

        }