diff options
| author | Etan Cohen <etancohen@google.com> | 2017-05-12 12:25:07 -0700 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2017-05-12 12:25:07 -0700 |
| commit | f2344ef55a71f1b2e47a7913c756f0af546d0cb1 (patch) | |
| tree | 65f5c7c188346e6d18408302ce9a2d4c00ae5ad4 /tests | |
| parent | d97a85f3ae5f5ff8213827a4389ba188b99f528a (diff) | |
[AWARE] Add a fixed service-name for OOB passphrase-protected data-path
PMK generation from Passphrase uses passphrase + service name + PMI.
However, service name is not available for OOB setups. In such a case
use a fixed string.
Already added for initiator. This CL adds it for the responder as well.
Bug: 38171946
Test: unit tests + existing integrated (sl4a) tests + CtsVerifier
Change-Id: I175fe524dc16363f663a8fb10c200831b11ceaf9
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java index f0758934a..37dd86b84 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java @@ -149,7 +149,7 @@ public class WifiAwareDataPathStateManagerTest { any(), any(), any(), any(), anyBoolean(), any())).thenReturn(true); when(mMockNative.respondToDataPathRequest(anyShort(), anyBoolean(), anyInt(), any(), - any(), any(), any())).thenReturn(true); + any(), any(), anyBoolean(), any())).thenReturn(true); when(mMockNative.endDataPath(anyShort(), anyInt())).thenReturn(true); when(mMockNetworkInterface.configureAgentProperties(any(), any(), anyInt(), any(), any(), @@ -495,7 +495,7 @@ public class WifiAwareDataPathStateManagerTest { mDut.onDataPathRequestNotification(pubSubId, peerDiscoveryMac, ndpId); mMockLooper.dispatchAll(); inOrder.verify(mMockNative).respondToDataPathRequest(anyShort(), eq(false), - eq(ndpId), eq(""), eq(null), eq(null), any()); + eq(ndpId), eq(""), eq(null), eq(null), anyBoolean(), any()); } verifyNoMoreInteractions(mMockNative, mMockCm); @@ -551,7 +551,7 @@ public class WifiAwareDataPathStateManagerTest { mDut.onDataPathRequestNotification(pubSubId, peerDiscoveryMac, ndpId); mMockLooper.dispatchAll(); inOrder.verify(mMockNative).respondToDataPathRequest(anyShort(), eq(false), - eq(ndpId), eq(""), eq(null), eq(null), any()); + eq(ndpId), eq(""), eq(null), eq(null), anyBoolean(), any()); } verifyNoMoreInteractions(mMockNative, mMockCm); @@ -691,7 +691,7 @@ public class WifiAwareDataPathStateManagerTest { mMockLooper.dispatchAll(); inOrder.verify(mMockNative).respondToDataPathRequest(transactionId.capture(), eq(true), eq(ndpId), eq(sAwareInterfacePrefix + "0"), eq(providePmk ? pmk : null), eq(null), - any()); + eq(useDirect), any()); mDut.onRespondToDataPathSetupRequestResponse(transactionId.getValue(), true, 0); mMockLooper.dispatchAll(); |