commit 7f567d422be1ff0b4cdb6c04b5ce76a0110d7743
author Bonian Chen <bonianchen@google.com> Fri Aug 07 07:16:37 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 07 07:16:37 2020 +0000
tree fad85089501413163ce0ddb657bccb62c529cb83
parent 4d010401607e97dfb4673a2b03a0aedfdbd2d39d
parent 99a7c3ef0031272872c4520e986eb00737c7fdca

Merge "Remove the second network scan." am: 99a7c3ef00

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

Change-Id: I84fd87b8ce8f116ba291159c2cf8e39198d05c2b

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 e288763..b36248f 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -222,10 +222,11 @@
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE:
+                    final boolean isSucceed = (boolean) msg.obj;
+                    stopNetworkQuery();
                     setProgressBarVisible(false);
                     getPreferenceScreen().setEnabled(true);
 
-                    boolean isSucceed = (boolean) msg.obj;
                     mSelectedPreference.setSummary(isSucceed
                             ? R.string.network_connected
                             : R.string.network_could_not_connect);