diff options
| author | Etan Cohen <etancohen@google.com> | 2017-04-24 23:25:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-24 23:25:11 +0000 |
| commit | 3fe2643aff2fda817167e3274252ae183ecbbd85 (patch) | |
| tree | d5bddeb8bbaccd9ad37cb5e792b46bff6ed247c0 | |
| parent | a84a8d948173001e1ba9265e15b8a93aad312201 (diff) | |
| parent | 5896b01cb26e71c1102d17a0fa7baacd6e4d963a (diff) | |
Merge "[AWARE] Specify a match of only the first discovery" into oc-dev am: 84a08e7fc9
am: 5896b01cb2
Change-Id: Ie6fe6cb28a22b6bea12ae3277758e46fa47450e7
| -rw-r--r-- | service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java | 2 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java b/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java index 8d99befdd..2efa2aecc 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java @@ -367,7 +367,7 @@ public class WifiAwareNativeApi { req.baseConfigs.discoveryCount = 0; convertNativeByteArrayToArrayList(subscribeConfig.mServiceName, req.baseConfigs.serviceName); - req.baseConfigs.discoveryMatchIndicator = subscribeConfig.mMatchStyle; + req.baseConfigs.discoveryMatchIndicator = NanMatchAlg.MATCH_ONCE; convertNativeByteArrayToArrayList(subscribeConfig.mServiceSpecificInfo, req.baseConfigs.serviceSpecificInfo); convertNativeByteArrayToArrayList(subscribeConfig.mMatchFilter, diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java index 0ffb04bd2..b5e12d29c 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java @@ -601,8 +601,7 @@ public class WifiAwareServiceImplTest { // caught by the Builder. Want to test whether service side will catch invalidly // constructed configs. SubscribeConfig subscribeConfig = new SubscribeConfig(serviceName.getBytes(), ssi, - matchFilter, SubscribeConfig.SUBSCRIBE_TYPE_PASSIVE, 0, - SubscribeConfig.MATCH_STYLE_ALL, true); + matchFilter, SubscribeConfig.SUBSCRIBE_TYPE_PASSIVE, 0, true); int clientId = doConnect(); IWifiAwareDiscoverySessionCallback mockCallback = mock( IWifiAwareDiscoverySessionCallback.class); |