From ef5c4a53971cab85569a50b9195f0aaed7f57653 Mon Sep 17 00:00:00 2001
From: Holly Jiuyu Sun <jiuyu@google.com>
Date: Thu, 17 Jan 2019 20:23:38 -0800
Subject: [PATCH] Check whether cardId is valid in EuiccManager#isEnabled.

EuiccManager#isEnabled should be only true if its cardId is a valid one.

Bug: 111614811
Test: test on phone
Change-Id: I7b63d3e117a1bd1eb17dab8e1a7b1dfec1a8abe8
Merged-In: I7b63d3e117a1bd1eb17dab8e1a7b1dfec1a8abe8
---
 telephony/java/android/telephony/euicc/EuiccManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/telephony/java/android/telephony/euicc/EuiccManager.java b/telephony/java/android/telephony/euicc/EuiccManager.java
index 95dfffd30e72c..a5c0442948ac6 100644
--- a/telephony/java/android/telephony/euicc/EuiccManager.java
+++ b/telephony/java/android/telephony/euicc/EuiccManager.java
@@ -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;
     }
 
     /**