commit 1e1251cc04ee9636721719aa0a13d94e15500258
author Prem Kumar <premk@google.com> Tue Dec 09 02:25:14 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 09 02:25:15 2014 +0000
tree 760d70b72d6218c86966894fb94aa3a77b0e2283
parent 1e3be7d9ce27cf5ee7df78c675603a628eb0023d
parent c29c58353679fc5df845bd9d565f7b421c5d9403

Merge "Fixed a SIM Cards crash." into lmp-mr1-dev

src/com/android/settings/sim/SimDialogActivity.java

diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index cf3ccdf..6aceb46 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -152,7 +152,7 @@
         final SubscriptionManager subscriptionManager = SubscriptionManager.from(context);
         final List<SubscriptionInfo> subInfoList =
             subscriptionManager.getActiveSubscriptionInfoList();
-        final int selectableSubInfoLength = subInfoList.size();
+        final int selectableSubInfoLength = subInfoList == null ? 0 : subInfoList.size();
 
         final DialogInterface.OnClickListener selectionListener =
                 new DialogInterface.OnClickListener() {