From 3dd02f1e60b930f59d33c462aa2daefb4baf65e5 Mon Sep 17 00:00:00 2001 From: Etan Cohen Date: Thu, 13 Jul 2017 06:44:17 -0700 Subject: [AWARE] Restrict number of data interfaces and paths Restrict the number of supported data-interfaces (NDIs) to 1 and the number of data-paths (NDPs) per NDI to 1. Limit will be removed (in steps) once framework support is added. Bug: 63633579 Bug: 31940045 Test: TBD - fails, bug outstanding to partner Change-Id: I3934b68b121f0d72b2ff4595653129c689183e64 --- .../android/server/wifi/aware/WifiAwareDataPathStateManager.java | 8 ++++++++ .../com/android/server/wifi/aware/WifiAwareNativeCallback.java | 5 +++++ 2 files changed, 13 insertions(+) (limited to 'service') diff --git a/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java b/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java index 82a3264ee..558274c8d 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java @@ -635,6 +635,14 @@ public class WifiAwareDataPathStateManager { + " - can't parse network specifier"); return false; } + + // TODO (b/63635780) support more then a single concurrent NDP + if (mNetworkRequestsCache.size() > 0) { + Log.e(TAG, "WifiAwareNetworkFactory.acceptRequest: request=" + request + + " - >1 concurrent NDPs aren't supported (yet)."); + return false; + } + mNetworkRequestsCache.put(networkSpecifier, nnri); return true; diff --git a/service/java/com/android/server/wifi/aware/WifiAwareNativeCallback.java b/service/java/com/android/server/wifi/aware/WifiAwareNativeCallback.java index 35773210b..6fdcc36c6 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareNativeCallback.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareNativeCallback.java @@ -167,6 +167,11 @@ public class WifiAwareNativeCallback extends IWifiNanIfaceEventCallback.Stub imp capabilities.maxSubscribeInterfaceAddresses; frameworkCapabilities.supportedCipherSuites = capabilities.supportedCipherSuites; + // TODO (b/63635780, b/63635857): enable framework support of >1 NDI and >1 NDP per NDI + // Until then: force corresponding capabilities to 1. + frameworkCapabilities.maxNdiInterfaces = 1; + frameworkCapabilities.maxNdpSessions = 1; + mWifiAwareStateManager.onCapabilitiesUpdateResponse(id, frameworkCapabilities); } else { Log.e(TAG, "notifyCapabilitiesResponse: error code=" + status.status + " (" -- cgit v1.2.3