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

Commit 00eaf3f7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7975ae92fa2be360b20dfc4d18f4ad9af789ebe
parents 9e072f09 b086fed6

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;

    }