Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev

2020-06-15 03:09:21 +00:00
parent 8357871465 c3703cb4fe
commit 518ffd7c76
5 changed files with 180 additions and 23 deletions
--- a/tests/robotests/src/com/android/settings/network/telephony/NetworkScanHelperTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/NetworkScanHelperTest.java
@@ -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();
        }