diff options
| author | Etan Cohen <etancohen@google.com> | 2017-05-10 16:17:01 -0700 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2017-06-01 13:08:26 -0700 |
| commit | 9fc0418bd441b14c465c3fe35e07bceac10208be (patch) | |
| tree | 82ca8be3ecdad42facfd248d1a7efdc9a99489ac /service | |
| parent | ffad8da00fefb79505636a7044483650113a7f8b (diff) | |
[AWARE] Delegate channel selection to HAL
Aware data-path operational channel selection: HAL provides
API for framework to: delegate, recommend, or require channel.
The framework currently doesn't have a mechanism to select the
channel so this CL explicitly delegates selection to HAL.
Bug: 36905549
Test: unit-tests & integration (sl4a) tests
Change-Id: I8152e9a1fc262fe856b24002762b1c69891dbcf7
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java b/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java index aebc37c72..aa1771c60 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java @@ -639,7 +639,7 @@ public class WifiAwareDataPathStateManager { nnri.interfaceName = selectInterfaceForRequest(nnri); mMgr.initiateDataPathSetup(networkSpecifier, nnri.networkSpecifier.peerId, - NanDataPathChannelCfg.REQUEST_CHANNEL_SETUP, selectChannelForRequest(nnri), + NanDataPathChannelCfg.CHANNEL_NOT_REQUESTED, selectChannelForRequest(nnri), nnri.peerDiscoveryMac, nnri.interfaceName, nnri.networkSpecifier.pmk, nnri.networkSpecifier.passphrase, nnri.networkSpecifier.isOutOfBand()); nnri.state = @@ -781,7 +781,8 @@ public class WifiAwareDataPathStateManager { /** * Select a channel for the network request. * - * TODO: for now simply select channel 6 + * TODO (b/38209409): The value from this function isn't currently used - the channel selection + * is delegated to the HAL. */ private int selectChannelForRequest(AwareNetworkRequestInformation req) { return 2437; |