PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657" into sc-dev am: 9bad17d5e8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13627529

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I375751209facea74ea083992ad88985ff283b07c
This commit is contained in:
Bonian Chen
2021-02-20 09:22:23 +00:00
committed by Automerger Merge Worker
parent c3f12b1895 9bad17d5e8
commit 5a4815b06c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/network/telephony/NetworkSelectSettings.java
View File

@@ -343,16 +343,6 @@ public class NetworkSelectSettings extends DashboardFragment {
mPreferenceCategory.getPreference(numberOfPreferences)); 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 // update the content of preference
NetworkOperatorPreference connectedPref = null; NetworkOperatorPreference connectedPref = null;
for (int index = 0; index < mCellInfoList.size(); index++) { 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; return connectedPref;
} }