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

Commit b5006388 authored by Treehugger Robot's avatar Treehugger Robot Committed by Bonian Chen
Browse files

Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed6 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1581223

Bug: 179754915
Change-Id: Ic7975ae92fa2be360b20dfc4d18f4ad9af789ebe
(cherry picked from commit 00eaf3f7)
parent 2e47875c

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;

    }