From 1b5916b26e121df91702c3bb40aa433dde9b6404 Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@google.com>
Date: Mon, 16 Jun 2014 11:48:33 -0700
Subject: [PATCH] Check for subId array being null.

Bug: 15665102
Change-Id: I9424da81311eacebf280a30c4e32a530be4a3278
---
 telephony/java/android/telephony/TelephonyManager.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index aaee99f3e280f..50bbb1edc9628 100644
--- 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 =