Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5ab7026 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Default the lastSelectetNetworkId to -1"

parents 9f204ae9 bdd9ac23

core/java/android/net/RecommendationRequest.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

core/tests/coretests/src/android/net/RecommendationRequestTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

    }