From c29c58353679fc5df845bd9d565f7b421c5d9403 Mon Sep 17 00:00:00 2001 From: PauloftheWest Date: Mon, 8 Dec 2014 12:23:34 -0800 Subject: [PATCH] Fixed a SIM Cards crash. + Added a check if getActiveSubscriptionInfoList returns null. Bug: 18634751 Change-Id: Ib6012816c26525a61fb199912d06d6c1572e0fd6 --- src/com/android/settings/sim/SimDialogActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java index cf3ccdf5372..6aceb46c31d 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 subInfoList = subscriptionManager.getActiveSubscriptionInfoList(); - final int selectableSubInfoLength = subInfoList.size(); + final int selectableSubInfoLength = subInfoList == null ? 0 : subInfoList.size(); final DialogInterface.OnClickListener selectionListener = new DialogInterface.OnClickListener() {