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

Commit 95538f6c authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[AWARE] Enable discovery/operation on 5G" into qt-dev am: 05777f1a 

am: 751c2781

Change-Id: Ic6ee5ad299b3b84df5cd88591822538ae2afc04a
parents 2ed5718b 751c2781

wifi/java/android/net/wifi/aware/ConfigRequest.java

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ public final class ConfigRequest implements Parcelable { 
     * Builder used to build {@link ConfigRequest} objects.

     */

    public static final class Builder {

        private boolean mSupport5gBand = false;

        private boolean mSupport5gBand = true;

        private int mMasterPreference = 0;

        private int mClusterLow = CLUSTER_ID_MIN;

        private int mClusterHigh = CLUSTER_ID_MAX;

wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ public class WifiAwareManagerTest { 
                equalTo(configRequest.mClusterLow));

        collector.checkThat("mMasterPreference", 0,

                equalTo(configRequest.mMasterPreference));

        collector.checkThat("mSupport5gBand", false, equalTo(configRequest.mSupport5gBand));

        collector.checkThat("mSupport5gBand", true, equalTo(configRequest.mSupport5gBand));

        collector.checkThat("mDiscoveryWindowInterval.length", 2,

                equalTo(configRequest.mDiscoveryWindowInterval.length));

        collector.checkThat("mDiscoveryWindowInterval[2.4GHz]", ConfigRequest.DW_INTERVAL_NOT_INIT,