LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use ParcelFileDescriptor instead of FileDescriptor in INetd.aidl" am: 1038ffef1b am: 74b4d20c28

Browse Source 
am: 83ab6ba827

Change-Id: I1dd010a0b4ec54c87b509c1e05185164fde9e4cb
This commit is contained in:
Luke Huang
2018-12-04 22:44:36 -08:00
committed by android-build-merger
parent 2861b15093 83ab6ba827
commit 136e24df90
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/net/java/com/android/server/IpSecServiceParameterizedTest.java
View File

@@ -542,7 +542,7 @@ public class IpSecServiceParameterizedTest {
verify(mMockNetd) verify(mMockNetd)
.ipSecApplyTransportModeTransform( .ipSecApplyTransportModeTransform(
eq(pfd.getFileDescriptor()), eq(pfd),
eq(mUid), eq(mUid),
eq(IpSecManager.DIRECTION_OUT), eq(IpSecManager.DIRECTION_OUT),
anyString(), anyString(),
@@ -555,7 +555,7 @@ public class IpSecServiceParameterizedTest {
ParcelFileDescriptor pfd = ParcelFileDescriptor.fromSocket(new Socket()); ParcelFileDescriptor pfd = ParcelFileDescriptor.fromSocket(new Socket());
mIpSecService.removeTransportModeTransforms(pfd); mIpSecService.removeTransportModeTransforms(pfd);
verify(mMockNetd).ipSecRemoveTransportModeTransform(pfd.getFileDescriptor()); verify(mMockNetd).ipSecRemoveTransportModeTransform(pfd);
} }
private IpSecTunnelInterfaceResponse createAndValidateTunnel( private IpSecTunnelInterfaceResponse createAndValidateTunnel(

6
tests/net/java/com/android/server/IpSecServiceTest.java
View File

@@ -425,7 +425,7 @@ public class IpSecServiceTest {
ParcelFileDescriptor pfd = ParcelFileDescriptor.fromSocket(new Socket()); ParcelFileDescriptor pfd = ParcelFileDescriptor.fromSocket(new Socket());
mIpSecService.removeTransportModeTransforms(pfd); mIpSecService.removeTransportModeTransforms(pfd);
verify(mMockNetd).ipSecRemoveTransportModeTransform(pfd.getFileDescriptor()); verify(mMockNetd).ipSecRemoveTransportModeTransform(pfd);
} }
@Test @Test
@@ -620,10 +620,10 @@ public class IpSecServiceTest {
mIpSecService.openUdpEncapsulationSocket(0, new Binder()); mIpSecService.openUdpEncapsulationSocket(0, new Binder());
FileDescriptor sockFd = udpEncapResp.fileDescriptor.getFileDescriptor(); FileDescriptor sockFd = udpEncapResp.fileDescriptor.getFileDescriptor();
ArgumentMatcher<FileDescriptor> fdMatcher = (arg) -> { ArgumentMatcher<ParcelFileDescriptor> fdMatcher = (arg) -> {
try { try {
StructStat sockStat = Os.fstat(sockFd); StructStat sockStat = Os.fstat(sockFd);
StructStat argStat = Os.fstat(arg); StructStat argStat = Os.fstat(arg.getFileDescriptor());
return sockStat.st_ino == argStat.st_ino return sockStat.st_ino == argStat.st_ino
&& sockStat.st_dev == argStat.st_dev; && sockStat.st_dev == argStat.st_dev;