From 3ec0fd4f19a1002ed08c9afe25a6a8bf707fe370 Mon Sep 17 00:00:00 2001
From: Adnan <adnan@cyngn.com>
Date: Wed, 1 Apr 2015 16:11:31 -0700
Subject: Telephony: Disallow RilMessageDecoder creation if slotId is invalid.

  A bad merge of 9902cb4e leads to possible creation of a RilMessageDecoder
  with an invalid slot id. Check for it before creating RilMessageDecoder for
  the slot.

Change-Id: I0c639267e310c9d1706454dfc5dd1b377a7ec022
---
 src/java/com/android/internal/telephony/cat/RilMessageDecoder.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java/com/android/internal/telephony/cat/RilMessageDecoder.java b/src/java/com/android/internal/telephony/cat/RilMessageDecoder.java
index 59c0b4a58..f143463d6 100644
--- a/src/java/com/android/internal/telephony/cat/RilMessageDecoder.java
+++ b/src/java/com/android/internal/telephony/cat/RilMessageDecoder.java
@@ -16,6 +16,7 @@
 
 package com.android.internal.telephony.cat;
 
+import android.telephony.SubscriptionManager;
 import com.android.internal.telephony.uicc.IccFileHandler;
 import com.android.internal.telephony.uicc.IccUtils;
 import com.android.internal.telephony.PhoneConstants;
@@ -64,7 +65,7 @@ class RilMessageDecoder extends StateMachine {
             }
         }
 
-        if (slotId < mSimCount) {
+        if (slotId != SubscriptionManager.INVALID_SLOT_ID && slotId < mSimCount) {
             if (null == mInstance[slotId]) {
                 mInstance[slotId] = new RilMessageDecoder(caller, fh);
             }
-- 
cgit v1.2.3