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

2019-01-18 21:43:09 +00:00
parent 90c7d2155f fc33a42309
commit e6f2eefcd8
1 changed files with 1 additions and 1 deletions
--- a/telephony/java/android/telephony/euicc/EuiccManager.java
+++ b/telephony/java/android/telephony/euicc/EuiccManager.java
@@ -361,7 +361,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;
    }

    /**