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

Commit 9bad17d5 authored by Bonian Chen's avatar Bonian Chen Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then... 

Merge "Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed6" into sc-dev
parents cb2c6bf3 b5006388

src/com/android/settings/network/telephony/NetworkSelectSettings.java

+10 −10
Original line number Diff line number Diff line
@@ -343,16 +343,6 @@ public class NetworkSelectSettings extends DashboardFragment { 
                    mPreferenceCategory.getPreference(numberOfPreferences));

        }



        // update selected preference instance by index

        for (int index = 0; index < mCellInfoList.size(); index++) {

            final CellInfo cellInfo = mCellInfoList.get(index);



            if ((mSelectedPreference != null) && mSelectedPreference.isSameCell(cellInfo)) {

                mSelectedPreference = (NetworkOperatorPreference)

                        (mPreferenceCategory.getPreference(index));

            }

        }



        // update the content of preference

        NetworkOperatorPreference connectedPref = null;

        for (int index = 0; index < mCellInfoList.size(); index++) {
@@ -386,6 +376,16 @@ public class NetworkSelectSettings extends DashboardFragment { 
            }

        }



        // update selected preference instance by index

        for (int index = 0; index < mCellInfoList.size(); index++) {

            final CellInfo cellInfo = mCellInfoList.get(index);



            if ((mSelectedPreference != null) && mSelectedPreference.isSameCell(cellInfo)) {

                mSelectedPreference = (NetworkOperatorPreference)

                        (mPreferenceCategory.getPreference(index));

            }

        }



        return connectedPref;

    }