diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-06-09 00:01:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-09 00:01:57 +0000 |
| commit | 075bd7d36827139944a2f4e67f2c68fbb884d189 (patch) | |
| tree | 5e7f6f6dc7a01a803a2acd7180060b037973def2 | |
| parent | f32019cb98bf0fe9a64a7be0d5bf0bd66c1b4199 (diff) | |
| parent | df4a12cfd5bf077f2295f96d8afa2a6b330237eb (diff) | |
Merge "[AWARE] Add test mechanism to set randomization interval" into oc-dr1-dev
| -rw-r--r-- | service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java | 10 |
1 files changed, 8 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 98d811f2e..d6af07643 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java @@ -74,6 +74,8 @@ public class WifiAwareNativeApi implements WifiAwareShellCommand.DelegatedShellC public static final String PARAM_DW_ON_IDLE_24GHZ = "dw_on_idle_24ghz"; public static final String PARAM_DW_ON_IDLE_5GHZ = "dw_on_idle_5ghz"; + public static final String PARAM_MAC_RANDOM_INTERVAL_SEC = "mac_random_interval_sec"; + private Map<String, Integer> mSettableParameters = new HashMap<>(); { // see wifi/1.0/types.hal NanBandSpecificConfig.discoveryWindowIntervalVal for description @@ -81,6 +83,8 @@ public class WifiAwareNativeApi implements WifiAwareShellCommand.DelegatedShellC mSettableParameters.put(PARAM_DW_ON_INACTIVE_5GHZ, 0); // 0 = disabled mSettableParameters.put(PARAM_DW_ON_IDLE_24GHZ, -1); // NOP (but disabling on IDLE) mSettableParameters.put(PARAM_DW_ON_IDLE_5GHZ, -1); // NOP (but disabling on IDLE) + + mSettableParameters.put(PARAM_MAC_RANDOM_INTERVAL_SEC, 1800); // 30 minutes } /** @@ -206,7 +210,8 @@ public class WifiAwareNativeApi implements WifiAwareShellCommand.DelegatedShellC req.configParams.includeSubscribeServiceIdsInBeacon = true; req.configParams.numberOfSubscribeServiceIdsInBeacon = 0; req.configParams.rssiWindowSize = 8; - req.configParams.macAddressRandomizationIntervalSec = 1800; + req.configParams.macAddressRandomizationIntervalSec = mSettableParameters.get( + PARAM_MAC_RANDOM_INTERVAL_SEC); NanBandSpecificConfig config24 = new NanBandSpecificConfig(); config24.rssiClose = 60; @@ -276,7 +281,8 @@ public class WifiAwareNativeApi implements WifiAwareShellCommand.DelegatedShellC req.includeSubscribeServiceIdsInBeacon = true; req.numberOfSubscribeServiceIdsInBeacon = 0; req.rssiWindowSize = 8; - req.macAddressRandomizationIntervalSec = 1800; + req.macAddressRandomizationIntervalSec = mSettableParameters.get( + PARAM_MAC_RANDOM_INTERVAL_SEC); NanBandSpecificConfig config24 = new NanBandSpecificConfig(); config24.rssiClose = 60; |