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

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

Change-Id: I4721d6a74d655fca65f7a95ee996d3421581871e
This commit is contained in:
Treehugger Robot
2020-08-12 06:46:58 +00:00
committed by Automerger Merge Worker

View File

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