Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce9a7420 authored by cretin45's avatar cretin45 Committed by Ed Carrigan
Browse files

Setupwizard: Fix msim NPE where sim only in slot 2 

Change-Id: I919129185cb49c51f9f02d9718e116e7d02b0d2c
(cherry picked from commit ac84dc0f)
parent 225b927b

src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.net.ConnectivityManager;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;



import com.android.internal.telephony.TelephonyIntents;
@@ -127,7 +128,7 @@ public class CMSetupWizardData extends AbstractSetupData { 
        ChooseDataSimPage chooseDataSimPage =

                (ChooseDataSimPage) getPage(ChooseDataSimPage.TAG);

        if (chooseDataSimPage != null) {

            chooseDataSimPage.setHidden(!isSimInserted());

            chooseDataSimPage.setHidden(!allSimsInserted());

        }

    }
@@ -185,7 +186,7 @@ public class CMSetupWizardData extends AbstractSetupData { 
                return false;

            }

        }

        return true;

        return simSlotCount == SubscriptionManager.from(mContext).getActiveSubscriptionInfoCount();

    }



}

src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java

+4 −5
Original line number Diff line number Diff line
@@ -124,9 +124,8 @@ public class ChooseDataSimPage extends SetupPage { 
            List<SubscriptionInfo> subInfoRecords = mSubscriptionManager.getActiveSubscriptionInfoList();

            int simCount = subInfoRecords.size();

            mSubInfoRecords = new SparseArray<SubscriptionInfo>(simCount);

            for (int i = 0; i < simCount; i++) {

                SubscriptionInfo subInfoRecord = subInfoRecords.get(i);

                mSubInfoRecords.put(subInfoRecord.getSubscriptionId(), subInfoRecord);

            for (SubscriptionInfo subInfoRecord : subInfoRecords) {

                mSubInfoRecords.put(subInfoRecord.getSimSlotIndex(), subInfoRecord);

            }

            mNameViews = new SparseArray<TextView>(simCount);

            mSignalViews = new SparseArray<ImageView>(simCount);
@@ -170,7 +169,7 @@ public class ChooseDataSimPage extends SetupPage { 
            mIsAttached = true;

            mPhone = (TelephonyManager)getActivity().getSystemService(Context.TELEPHONY_SERVICE);

            for (int i = 0; i < mPhoneStateListeners.size(); i++) {

                mPhone.listen(mPhoneStateListeners.get(i),

                mPhone.listen(mPhoneStateListeners.valueAt(i),

                        PhoneStateListener.LISTEN_SERVICE_STATE

                                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);

            }
@@ -189,7 +188,7 @@ public class ChooseDataSimPage extends SetupPage { 
            super.onPause();

            mIsAttached = false;

            for (int i = 0; i < mPhoneStateListeners.size(); i++) {

                mPhone.listen(mPhoneStateListeners.get(i), PhoneStateListener.LISTEN_NONE);

                mPhone.listen(mPhoneStateListeners.valueAt(i), PhoneStateListener.LISTEN_NONE);

            }

        }