diff options
| author | Etan Cohen <etancohen@google.com> | 2017-06-13 17:27:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-13 17:27:35 +0000 |
| commit | c176cab279c371db0baabc0d98706b649b0103c6 (patch) | |
| tree | 166a8d1854005a1e6998b32f2c2ed313bbf307ca /service | |
| parent | 69fe3dabdbd59c0da5e0114884b44794172e65d6 (diff) | |
| parent | 8e0c004c4d3202b302d2503663d44d92281a8b27 (diff) | |
Merge "[AWARE] Add test mechanism to specify default DW spec" into oc-dr1-dev am: 613bc28a67
am: 8e0c004c4d
Change-Id: Ia7cef776023c73f18839c11aec1e9a69ea39656d
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java b/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java index d6af07643..b453f31d1 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java @@ -69,6 +69,8 @@ public class WifiAwareNativeApi implements WifiAwareShellCommand.DelegatedShellC /* * Parameters settable through the shell command. */ + public static final String PARAM_DW_DEFAULT_24GHZ = "dw_default_24ghz"; + public static final String PARAM_DW_DEFAULT_5GHZ = "dw_default_5ghz"; public static final String PARAM_DW_ON_INACTIVE_24GHZ = "dw_on_inactive_24ghz"; public static final String PARAM_DW_ON_INACTIVE_5GHZ = "dw_on_inactive_5ghz"; public static final String PARAM_DW_ON_IDLE_24GHZ = "dw_on_idle_24ghz"; @@ -79,6 +81,8 @@ public class WifiAwareNativeApi implements WifiAwareShellCommand.DelegatedShellC private Map<String, Integer> mSettableParameters = new HashMap<>(); { // see wifi/1.0/types.hal NanBandSpecificConfig.discoveryWindowIntervalVal for description + mSettableParameters.put(PARAM_DW_DEFAULT_24GHZ, -1); // Firmware default + mSettableParameters.put(PARAM_DW_DEFAULT_5GHZ, -1); // Firmware default mSettableParameters.put(PARAM_DW_ON_INACTIVE_24GHZ, 4); // 4 = DW=8, latency 4s mSettableParameters.put(PARAM_DW_ON_INACTIVE_5GHZ, 0); // 0 = disabled mSettableParameters.put(PARAM_DW_ON_IDLE_24GHZ, -1); // NOP (but disabling on IDLE) @@ -875,6 +879,11 @@ public class WifiAwareNativeApi implements WifiAwareShellCommand.DelegatedShellC mSettableParameters.get(PARAM_DW_ON_INACTIVE_5GHZ)); updateSingleConfigForPowerSettings(req.bandSpecificConfig[NanBandIndex.NAN_BAND_24GHZ], mSettableParameters.get(PARAM_DW_ON_INACTIVE_24GHZ)); + } else { // the default state + updateSingleConfigForPowerSettings(req.bandSpecificConfig[NanBandIndex.NAN_BAND_5GHZ], + mSettableParameters.get(PARAM_DW_DEFAULT_5GHZ)); + updateSingleConfigForPowerSettings(req.bandSpecificConfig[NanBandIndex.NAN_BAND_24GHZ], + mSettableParameters.get(PARAM_DW_DEFAULT_24GHZ)); } // else do nothing - normal power state |