From 903c9bd539894d6d7370c22f7979aa1c5e384532 Mon Sep 17 00:00:00 2001 From: Etan Cohen Date: Tue, 9 Apr 2019 13:10:47 -0700 Subject: [PATCH] [AWARE] Enable discovery/operation on 5G Speed up discovery, increase robustness. Bug: 129151127 Test: atest android.net.wifi Test: atest atest com.android.server.wifi Test: ACTS ThroughputTest:test_iperf_single_ndp_aware_only_ib Change-Id: I83cf0720d07e5623b7861bf4cd73344bcff90ba5 --- wifi/java/android/net/wifi/aware/ConfigRequest.java | 2 +- wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/java/android/net/wifi/aware/ConfigRequest.java b/wifi/java/android/net/wifi/aware/ConfigRequest.java index 1e46d1b16feb2..b07d8edde3d4c 100644 --- a/wifi/java/android/net/wifi/aware/ConfigRequest.java +++ b/wifi/java/android/net/wifi/aware/ConfigRequest.java @@ -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; diff --git a/wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java b/wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java index 52bb28485c723..db8220b419100 100644 --- a/wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java +++ b/wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java @@ -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,