commit 3e7b9e08c1a357be3b09f710713bca6934bb4778
author Nancy Chen <nancychen@google.com> Mon Sep 14 18:14:07 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 14 18:14:07 2015 +0000
tree d45f1c5c4fc98e64a4398b1042342cf32cdc082c
parent 7968ac01d63e622278c3560e9c5f507dace5b190
parent 56363875d0007ca8c8886a0e1dfcfe9579c76e1f

Merge "Fix potential sim change crash from invalid subscription id."

src/com/android/phone/vvm/omtp/SimChangeReceiver.java

diff --git a/src/com/android/phone/vvm/omtp/SimChangeReceiver.java b/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
index a3255e3..4e7c165 100644
--- a/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
+++ b/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
@@ -67,9 +67,14 @@
             case CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED:
                 int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
                         SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+                if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+                    Log.i(TAG, "Received SIM change for invalid subscription id.");
+                    return;
+                }
+
                 OmtpVvmCarrierConfigHelper carrierConfigHelper =
                         new OmtpVvmCarrierConfigHelper(context, subId);
-
                 if (carrierConfigHelper.isOmtpVvmType()) {
                     PhoneAccountHandle phoneAccount = PhoneUtils.makePstnPhoneAccountHandle(
                             SubscriptionManager.getPhoneId(subId));