commit 0989e9a6086afb9911281a9ab9dcd545d6caafd1
author Treehugger Robot <android-build-prod@system.gserviceaccount.com> Mon Jul 20 11:38:01 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 20 11:38:01 2020 +0000
tree d4e53d895ee2fbec03a75a304fecf0aa741a20a1
parent b6677d09b528d2be2c90e9624a7ab5ea24255490
parent d08d288b4f1308518592bc8d9b64c7e282b236d0

Merge "Prevent errors when updating operator pref summary" into r-keystone-qcom-dev

src/com/android/settings/network/telephony/NetworkSelectSettings.java

diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index f409285..73a8379 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -237,10 +237,13 @@
                     final boolean isSucceed = (boolean) msg.obj;
                     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.d(TAG, "No preference to update!");
+                    }
                     break;
                 case EVENT_NETWORK_SCAN_RESULTS:
                     final List<CellInfo> results = (List<CellInfo>) msg.obj;