From b2ceb1f8bb6acd8dc861da18e7a26cddebcbc035 Mon Sep 17 00:00:00 2001 From: emancebo Date: Fri, 15 May 2015 15:09:58 -0700 Subject: [PATCH] OOBE: fix NPE in choose data sim page Change-Id: Ib6228e7cd223d29ac48200e9a50c0900d35f8a4e --- src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java b/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java index de8c8e3..3950d74 100644 --- a/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java @@ -122,7 +122,8 @@ public class ChooseDataSimPage extends SetupPage { mPageView = (ViewGroup)mRootView.findViewById(R.id.page_view); mProgressBar = (ProgressBar) mRootView.findViewById(R.id.progress); List subInfoRecords = mSubscriptionManager.getActiveSubscriptionInfoList(); - int simCount = subInfoRecords.size(); + int simCount = + subInfoRecords != null ? subInfoRecords.size() : 0; mSubInfoRecords = new SparseArray(simCount); for (SubscriptionInfo subInfoRecord : subInfoRecords) { mSubInfoRecords.put(subInfoRecord.getSimSlotIndex(), subInfoRecord);