diff options
| author | Steven Laver <lavers@google.com> | 2019-01-20 16:40:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-20 16:40:46 +0000 |
| commit | c470daee1cf372142e66d4786f98b157f284dacb (patch) | |
| tree | c118879b496f19919078294bd68a7867dc7e5d0f /tests/net/java/com/android/server/IpSecServiceParameterizedTest.java | |
| parent | be058067720e1688137c15e68d5c4e50c4d66904 (diff) | |
| parent | 67924d836712134f300f2952dad900daa5f3c98d (diff) | |
Merge changes from topic "QP1A.190107.001" into q-keystone-qcom-dev
* changes:
Clear verification completed flag if an optional verifier is used
telephony: hide added members in DisconnectCause
location: fix build errors
Update CarrierIdentifier constructors to match public API signature
remove duplicate 'data_connection_5g'
Move persist.debug.trace handling to frameworks
Merge QP1A.190107.001
Diffstat (limited to 'tests/net/java/com/android/server/IpSecServiceParameterizedTest.java')
| -rw-r--r-- | tests/net/java/com/android/server/IpSecServiceParameterizedTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java index 4dc0341c8e2b..d8f961850906 100644 --- a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java +++ b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java @@ -542,7 +542,7 @@ public class IpSecServiceParameterizedTest { verify(mMockNetd) .ipSecApplyTransportModeTransform( - eq(pfd.getFileDescriptor()), + eq(pfd), eq(mUid), eq(IpSecManager.DIRECTION_OUT), anyString(), @@ -555,7 +555,7 @@ public class IpSecServiceParameterizedTest { ParcelFileDescriptor pfd = ParcelFileDescriptor.fromSocket(new Socket()); mIpSecService.removeTransportModeTransforms(pfd); - verify(mMockNetd).ipSecRemoveTransportModeTransform(pfd.getFileDescriptor()); + verify(mMockNetd).ipSecRemoveTransportModeTransform(pfd); } private IpSecTunnelInterfaceResponse createAndValidateTunnel( |