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

Commit 25696ef8 authored by Holly Jiuyu Sun's avatar Holly Jiuyu Sun Committed by android-build-merger
Browse files

Merge "Check whether cardId is valid in EuiccManager#isEnabled." am: feb047ac 

am: 4fc9c994

Change-Id: I356c5b13808562af3baf970dfad6443564f64590
parents ea5d6e1b 4fc9c994

telephony/java/android/telephony/euicc/EuiccManager.java

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ public class EuiccManager { 
    public boolean isEnabled() {

        // In the future, this may reach out to IEuiccController (if non-null) to check any dynamic

        // restrictions.

        return getIEuiccController() != null;

        return getIEuiccController() != null && mCardId != TelephonyManager.INVALID_CARD_ID;

    }



    /**