From b500638838934b0d1920dbfea4c139cbd5152f04 Mon Sep 17 00:00:00 2001 From: Treehugger Robot Date: Fri, 19 Feb 2021 09:04:14 +0000 Subject: [PATCH] Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1581223 Bug: 179754915 Change-Id: Ic7975ae92fa2be360b20dfc4d18f4ad9af789ebe (cherry picked from commit 00eaf3f7e0aca674d70d4e3b31da94477105c5b5) --- .../telephony/NetworkSelectSettings.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java index ff641e9851b..c8121c491be 100644 --- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java +++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java @@ -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; }