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

Merge "Prevent errors when updating operator pref summary" am: 5a19cea4ef am: c855a8a21a

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

Change-Id: Ibdb29f86401439a66c9aa3a456454e6caadddffa
This commit is contained in:
Treehugger Robot
2020-08-12 06:26:47 +00:00
committed by Automerger Merge Worker
parent 8c8761b74e c855a8a21a
commit 455d7924c4
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,9 +223,13 @@ public class NetworkSelectSettings extends DashboardFragment {
setProgressBarVisible(false); setProgressBarVisible(false);
getPreferenceScreen().setEnabled(true); getPreferenceScreen().setEnabled(true);
mSelectedPreference.setSummary(isSucceed if (mSelectedPreference != null) {
? R.string.network_connected mSelectedPreference.setSummary(isSucceed
: R.string.network_could_not_connect); ? R.string.network_connected
: R.string.network_could_not_connect);
} else {
Log.e(TAG, "No preference to update!");
}
break; break;
case EVENT_NETWORK_SCAN_RESULTS: case EVENT_NETWORK_SCAN_RESULTS:
final List<CellInfo> results = (List<CellInfo>) msg.obj; final List<CellInfo> results = (List<CellInfo>) msg.obj;