Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: d32cb38e45 am: c2f0ab12d8 am: 86aa01ea4f

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

Change-Id: Iefd7c8b53d1b57ecaafde5d9c4756d4f5338cfd4
This commit is contained in:
SongFerng Wang
2020-06-15 03:44:07 +00:00
committed by Automerger Merge Worker
5 changed files with 180 additions and 23 deletions

View File

@@ -164,7 +164,8 @@ public class NetworkScanHelperTest {
}
private void startNetworkScan_incremental(boolean waitForCompletion) {
mNetworkScanHelper.startNetworkScan();
mNetworkScanHelper.startNetworkScan(
NetworkScanHelper.NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS);
if (!waitForCompletion) {
mNetworkScanHelper.stopNetworkQuery();
}