commit 9bcf7861bd0c1cec7b34b68ea1054634760fade4
author SongFerngWang <songferngwang@google.com> Mon May 04 22:27:14 2020 +0800
committer Bonian Chen <bonianchen@google.com> Fri Aug 07 13:02:45 2020 +0800
tree 7b29eff93d8518d6769e51c0267dc5f26273ca3d
parent c78b12f3f45c5a659b909a5d9c1de3f428bedbd6

Remove the second network scan.

Fix: 153427564
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkSelectSettingsTest
(PASS)

Merged-In: If593fc4a4dd463bbc178b4864ad0ba01bb421b09
Change-Id: I34b898514351aa6c00934ce638e3a59a5aa8f077

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);