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

Commit 3c9dfe7f 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:... 

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

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



Change-Id: I4d7f19d806b2e2e8fc6de779610a9665ca223808
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0fd848ca a33c5553

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

+1 −1
Original line number Diff line number Diff line
@@ -2234,7 +2234,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;

        }