Merge "Consider SIM state not ready as absent."

1 files changed, 14 insertions, 1 deletions

diff --git a/service/java/com/android/server/wifi/util/TelephonyUtil.java b/service/java/com/android/server/wifi/util/TelephonyUtil.java
index 1dfa3812b..bfe514104 100644
--- a/service/java/com/android/server/wifi/util/TelephonyUtil.java
+++ b/service/java/com/android/server/wifi/util/TelephonyUtil.java
@@ -285,13 +285,26 @@ public class TelephonyUtil {
      * @return true if the subId is active, otherwise false.
      */
     public boolean isSimPresent(int subId) {
+        if (!SubscriptionManager.isValidSubscriptionId(subId)) {
+            return false;
+        }
         List<SubscriptionInfo> subInfoList = mSubscriptionManager.getActiveSubscriptionInfoList();
         if (subInfoList == null || subInfoList.isEmpty()) {
             return false;
         }
         return subInfoList.stream()
-                .anyMatch(info -> info.getSubscriptionId() == subId);
+                .anyMatch(info -> info.getSubscriptionId() == subId
+                        && isSimStateReady(info));
+    }
+
+    /**
+     * Check if SIM card for SubscriptionInfo is ready.
+     */
+    private boolean isSimStateReady(SubscriptionInfo info) {
+        int simSlotIndex = info.getSimSlotIndex();
+        return mTelephonyManager.getSimState(simSlotIndex) == TelephonyManager.SIM_STATE_READY;
     }
+
     /**
      * Get the identity for the current SIM or null if the SIM is not available
      *