diff options
| author | Wink Saville <wink@google.com> | 2014-06-16 11:48:33 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2014-06-16 11:48:33 -0700 |
| commit | 1b5916b26e121df91702c3bb40aa433dde9b6404 (patch) | |
| tree | 07a04e581403137e0930f9ab31b21f3265acd1cb /telephony/java/android | |
| parent | 34c6b86470124c6b2ae16d71e2b28f43cd9c7840 (diff) | |
| download | frameworks_base-1b5916b26e121df91702c3bb40aa433dde9b6404.zip frameworks_base-1b5916b26e121df91702c3bb40aa433dde9b6404.tar.gz frameworks_base-1b5916b26e121df91702c3bb40aa433dde9b6404.tar.bz2 | |
Check for subId array being null.
Bug: 15665102
Change-Id: I9424da81311eacebf280a30c4e32a530be4a3278
Diffstat (limited to 'telephony/java/android')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index aaee99f..50bbb1e 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 = |