From 4c2ce25f1cb62f391b056c8f0848feb74c950659 Mon Sep 17 00:00:00 2001
From: cretin45 <cretin45@gmail.com>
Date: Fri, 3 Apr 2015 16:07:01 -0700
Subject: [PATCH] SetupWizard: Don't assume order of SubInfoRecords

Change-Id: I3b4132afccc96a5d08986a3cb902bd384931f21f
---
 .../setupwizard/setup/ChooseDataSimPage.java          | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java b/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java
index f531c0e3..5c9c06b7 100644
--- a/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java
@@ -81,7 +81,7 @@ public class ChooseDataSimPage extends SetupPage {
         private SparseArray<CheckBox> mCheckBoxes;
 
         private TelephonyManager mPhone;
-        private List<SubInfoRecord> mSubInfoRecords;
+        private SparseArray<SubInfoRecord> mSubInfoRecords;
         private SparseArray<SignalStrength> mSignalStrengths;
         private SparseArray<ServiceState> mServiceStates;
         private SparseArray<PhoneStateListener> mPhoneStateListeners;
@@ -102,8 +102,13 @@ public class ChooseDataSimPage extends SetupPage {
         @Override
         protected void initializePage() {
             mPageView = (ViewGroup)mRootView.findViewById(R.id.page_view);
-            mSubInfoRecords =  SubscriptionManager.getActiveSubInfoList();
-            int simCount = mSubInfoRecords.size();
+            List<SubInfoRecord> subInfoRecords =  SubscriptionManager.getActiveSubInfoList();
+            int simCount = subInfoRecords.size();
+            mSubInfoRecords = new SparseArray<SubInfoRecord>(simCount);
+            for (int i = 0; i < simCount; i++) {
+                SubInfoRecord subInfoRecord = subInfoRecords.get(i);
+                mSubInfoRecords.put(subInfoRecord.slotId, subInfoRecord);
+            }
             mNameViews = new SparseArray<TextView>(simCount);
             mSignalViews = new SparseArray<ImageView>(simCount);
             mCheckBoxes = new SparseArray<CheckBox>(simCount);