summaryrefslogtreecommitdiffstats
path: root/service/java/com/android
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-06-07 01:00:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-06-07 01:00:21 +0000
commitd23921925eeb0d42497e5e4bee75b5e500d71fc0 (patch)
tree7fe7baa61c3377e8af9eea761e64dab582143092 /service/java/com/android
parentaf9b7b297e43fe6fe347a6143d76bde2cb2363c6 (diff)
parenta45902327a2ee77551a1a29833ab987a8dc7fd4f (diff)
downloadandroid_frameworks_opt_net_wifi-d23921925eeb0d42497e5e4bee75b5e500d71fc0.tar.gz
android_frameworks_opt_net_wifi-d23921925eeb0d42497e5e4bee75b5e500d71fc0.tar.bz2
android_frameworks_opt_net_wifi-d23921925eeb0d42497e5e4bee75b5e500d71fc0.zip
Merge "[AWARE]Change default DW" into qt-dev
Diffstat (limited to 'service/java/com/android')
-rw-r--r--service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java b/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java
index cccbbf697..d016b98d2 100644
--- a/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java
+++ b/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java
@@ -111,12 +111,12 @@ public class WifiAwareNativeApi implements WifiAwareShellCommand.DelegatedShellC
/* package */ static final String POWER_PARAM_IDLE_KEY = "idle";
/* package */ static final String PARAM_DW_24GHZ = "dw_24ghz";
- private static final int PARAM_DW_24GHZ_DEFAULT = -1; // Firmware default
+ private static final int PARAM_DW_24GHZ_DEFAULT = 1; // 1 -> DW=1, latency=512ms
private static final int PARAM_DW_24GHZ_INACTIVE = 4; // 4 -> DW=8, latency=4s
private static final int PARAM_DW_24GHZ_IDLE = 4; // == inactive
/* package */ static final String PARAM_DW_5GHZ = "dw_5ghz";
- private static final int PARAM_DW_5GHZ_DEFAULT = -1; // Firmware default
+ private static final int PARAM_DW_5GHZ_DEFAULT = 1; // 1 -> DW=1, latency=512ms
private static final int PARAM_DW_5GHZ_INACTIVE = 0; // 0 = disabled
private static final int PARAM_DW_5GHZ_IDLE = 0; // == inactive