PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8

Browse Source 
Change-Id: I05b12d26ba3015a24e97080bb98f1be416ae60fb
This commit is contained in:
SongFerng Wang
2020-05-05 03:33:06 +00:00
committed by Automerger Merge Worker
parent 004301ca4e 28754bf6a8
commit c2c4a49752
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/network/telephony/NetworkSelectSettings.java
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) {
// Don't enable screen here. Wait until result of network re-scan.
startNetworkQuery();
} else {
stopNetworkQuery(); stopNetworkQuery();
setProgressBarVisible(false); setProgressBarVisible(false);
getPreferenceScreen().setEnabled(true); getPreferenceScreen().setEnabled(true);
// For failure case, only update the summary of selected item.
mSelectedPreference.setSummary(R.string.network_could_not_connect); mSelectedPreference.setSummary(isSucceed
} ? R.string.network_connected
: 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;