From bdd9ac23248a3fa746fac11a39a965af0fca5c0c Mon Sep 17 00:00:00 2001 From: Jeremy Joslin Date: Mon, 6 Feb 2017 12:55:43 -0800 Subject: [PATCH] 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 --- core/java/android/net/RecommendationRequest.java | 4 ++-- .../coretests/src/android/net/RecommendationRequestTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java/android/net/RecommendationRequest.java b/core/java/android/net/RecommendationRequest.java index b89a245623eef..9f97c5a79506f 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 bd2550073dd30..e2e68834de7b0 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()); }