Renamed currentRecommendedWifiConfig to defaultWifiConfig.
Test: adb shell am instrument -w com.android.networkrecommendation.tests/android.support.test.runner.AndroidJUnitRunner
Bug: 34387385
Change-Id: Ic74a7b7a73816818fc232736d8dcf4062efbaced
Merged-In: Ie328f67803ca4021f4944faa70bc6aa2645c7372
diff --git a/src/com/android/networkrecommendation/DefaultNetworkRecommendationProvider.java b/src/com/android/networkrecommendation/DefaultNetworkRecommendationProvider.java
index 1f78df2..355d2b8 100644
--- a/src/com/android/networkrecommendation/DefaultNetworkRecommendationProvider.java
+++ b/src/com/android/networkrecommendation/DefaultNetworkRecommendationProvider.java
@@ -199,9 +199,9 @@
// empty recommendation.
RecommendationResult recommendationResult;
if (recommendedScanResult == null) {
- if (request.getCurrentSelectedConfig() != null) {
+ if (request.getDefaultWifiConfig() != null) {
recommendationResult = RecommendationResult
- .createConnectRecommendation(request.getCurrentSelectedConfig());
+ .createConnectRecommendation(request.getDefaultWifiConfig());
} else {
recommendationResult = RecommendationResult.createDoNotConnectRecommendation();
}
diff --git a/tests/src/com/android/networkrecommendation/DefaultNetworkRecommendationProviderTest.java b/tests/src/com/android/networkrecommendation/DefaultNetworkRecommendationProviderTest.java
index 47d0fe7..5b78310 100644
--- a/tests/src/com/android/networkrecommendation/DefaultNetworkRecommendationProviderTest.java
+++ b/tests/src/com/android/networkrecommendation/DefaultNetworkRecommendationProviderTest.java
@@ -22,7 +22,6 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import android.net.NetworkCapabilities;
import android.net.NetworkKey;
import android.net.NetworkRecommendationProvider;
import android.net.NetworkScoreManager;
@@ -175,8 +174,6 @@
RecommendationRequest request = new RecommendationRequest.Builder()
.setScanResults(scanResults)
- .setNetworkCapabilities(new NetworkCapabilities().removeCapability(
- NetworkCapabilities.NET_CAPABILITY_TRUSTED))
.build();
RecommendationResult result = verifyAndCaptureResult(request);
@@ -193,9 +190,7 @@
expectedConfig.BSSID = "bssid";
RecommendationRequest request = new RecommendationRequest.Builder()
.setScanResults(scanResults)
- .setNetworkCapabilities(new NetworkCapabilities().removeCapability(
- NetworkCapabilities.NET_CAPABILITY_TRUSTED))
- .setCurrentRecommendedWifiConfig(expectedConfig)
+ .setDefaultWifiConfig(expectedConfig)
.build();
RecommendationResult result = verifyAndCaptureResult(request);
@@ -208,8 +203,6 @@
RecommendationRequest request = new RecommendationRequest.Builder()
.setScanResults(scanResults)
- .setNetworkCapabilities(new NetworkCapabilities().removeCapability(
- NetworkCapabilities.NET_CAPABILITY_TRUSTED))
.build();
RecommendationResult result = verifyAndCaptureResult(request);
diff --git a/tests/src/com/android/networkrecommendation/DefaultNetworkRecommendationServiceTest.java b/tests/src/com/android/networkrecommendation/DefaultNetworkRecommendationServiceTest.java
index 1449d29..75aff2b 100644
--- a/tests/src/com/android/networkrecommendation/DefaultNetworkRecommendationServiceTest.java
+++ b/tests/src/com/android/networkrecommendation/DefaultNetworkRecommendationServiceTest.java
@@ -21,7 +21,6 @@
import android.content.Intent;
import android.net.INetworkRecommendationProvider;
-import android.net.NetworkCapabilities;
import android.net.NetworkKey;
import android.net.NetworkRecommendationProvider;
import android.net.NetworkScoreManager;
@@ -106,8 +105,6 @@
RecommendationRequest request = new RecommendationRequest.Builder()
.setScanResults(scanResults)
- .setNetworkCapabilities(new NetworkCapabilities().removeCapability(
- NetworkCapabilities.NET_CAPABILITY_TRUSTED))
.build();
Result result = requestRecommendation(service, request, SEQUENCE_ID);
