Check for subId array being null.

Bug: 15665102 Change-Id: I9424da81311eacebf280a30c4e32a530be4a3278
2014-06-16 11:48:33 -07:00
parent 34c6b86470
commit 1b5916b26e
1 changed files with 3 additions and 0 deletions
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@ -1414,6 +1414,9 @@ public class TelephonyManager {
    // FIXME the argument to pass is subId ??
    public int getSimState(int slotId) {
        long[] subId = SubscriptionManager.getSubId(slotId);
+        if (subId == null) {
+            return SIM_STATE_ABSENT;
+        }
        // FIXME Do not use a property to determine SIM_STATE, call
        // appropriate method on some object.
        String prop =