diff options
| -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); |