summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPauloftheWest <paulofthewest@google.com>2014-12-08 12:23:34 -0800
committerPauloftheWest <paulofthewest@google.com>2014-12-08 12:24:28 -0800
commitc29c58353679fc5df845bd9d565f7b421c5d9403 (patch)
tree9eeb5a07f32db9f20fac197b0dc00a83c74bc82a /src
parent838d6dc94970201792bc825091c9b520fb96821a (diff)
downloadpackages_apps_Settings-c29c58353679fc5df845bd9d565f7b421c5d9403.tar.gz
packages_apps_Settings-c29c58353679fc5df845bd9d565f7b421c5d9403.tar.bz2
packages_apps_Settings-c29c58353679fc5df845bd9d565f7b421c5d9403.zip
Fixed a SIM Cards crash.
+ Added a check if getActiveSubscriptionInfoList returns null. Bug: 18634751 Change-Id: Ib6012816c26525a61fb199912d06d6c1572e0fd6
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/sim/SimDialogActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index cf3ccdf53..6aceb46c3 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -152,7 +152,7 @@ public class SimDialogActivity extends Activity {
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() {