Remove the second network scan.

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

Change-Id: If593fc4a4dd463bbc178b4864ad0ba01bb421b09
This commit is contained in:
SongFerngWang
2020-05-04 22:27:14 +08:00
parent 15254e3b5e
commit b7f98f7667

View File

@@ -217,16 +217,13 @@ public class NetworkSelectSettings extends DashboardFragment {
switch (msg.what) { switch (msg.what) {
case EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE: case EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE:
final boolean isSucceed = (boolean) msg.obj; final boolean isSucceed = (boolean) msg.obj;
if (isSucceed) { stopNetworkQuery();
// Don't enable screen here. Wait until result of network re-scan. setProgressBarVisible(false);
startNetworkQuery(); getPreferenceScreen().setEnabled(true);
} else {
stopNetworkQuery(); mSelectedPreference.setSummary(isSucceed
setProgressBarVisible(false); ? R.string.network_connected
getPreferenceScreen().setEnabled(true); : R.string.network_could_not_connect);
// For failure case, only update the summary of selected item.
mSelectedPreference.setSummary(R.string.network_could_not_connect);
}
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;