summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeremy Joslin <jjoslin@google.com> 2017-02-06 12:55:43 -0800
committer Jeremy Joslin <jjoslin@google.com> 2017-02-06 12:55:43 -0800
commitbdd9ac23248a3fa746fac11a39a965af0fca5c0c (patch)
treeb9843aeb44315830e32586bf91a808710bfd117f
parent040ba81cd3732a1e968f911ae58d78b703c8095f (diff)
Default the lastSelectetNetworkId to -1
Test: adb shell am instrument -e class android.net.RecommendationRequestTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner Bug: 35045563 Change-Id: I04d71f2072d8a5a706f05905b580dd7af77d13d8
-rw-r--r--core/java/android/net/RecommendationRequest.java4
-rw-r--r--core/tests/coretests/src/android/net/RecommendationRequestTest.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/net/RecommendationRequest.java b/core/java/android/net/RecommendationRequest.java
index b89a245623ee..9f97c5a79506 100644
--- a/core/java/android/net/RecommendationRequest.java
+++ b/core/java/android/net/RecommendationRequest.java
@@ -50,7 +50,7 @@ public final class RecommendationRequest implements Parcelable {
private WifiConfiguration mDefaultConfig;
private WifiConfiguration mConnectedConfig;
private WifiConfiguration[] mConnectableConfigs;
- private int mLastSelectedNetworkId;
+ private int mLastSelectedNetworkId = -1;
private long mLastSelectedTimestamp;
public Builder setScanResults(ScanResult[] scanResults) {
@@ -161,7 +161,7 @@ public final class RecommendationRequest implements Parcelable {
/**
* @return The {@link WifiConfiguration#networkId} of the last user selected network.
- * {@code 0} if not set.
+ * {@code -1} if not set.
*/
public int getLastSelectedNetworkId() {
return mLastSelectedNetworkId;
diff --git a/core/tests/coretests/src/android/net/RecommendationRequestTest.java b/core/tests/coretests/src/android/net/RecommendationRequestTest.java
index bd2550073dd3..e2e68834de7b 100644
--- a/core/tests/coretests/src/android/net/RecommendationRequestTest.java
+++ b/core/tests/coretests/src/android/net/RecommendationRequestTest.java
@@ -96,7 +96,7 @@ public class RecommendationRequestTest extends AndroidTestCase {
RecommendationRequest parceled = passThroughParcel(request);
- assertEquals(0, parceled.getLastSelectedNetworkId());
+ assertEquals(-1, parceled.getLastSelectedNetworkId());
assertEquals(0, parceled.getLastSelectedNetworkTimestamp());
}