diff options
| author | Benedict Wong <benedictwong@google.com> | 2017-12-13 17:16:53 -0800 |
|---|---|---|
| committer | Benedict Wong <benedictwong@google.com> | 2018-01-17 12:10:49 -0800 |
| commit | 4f9fb810d874af068f19ceaf724732cbf79c6427 (patch) | |
| tree | 70b26e0e04a381bbf013e6be1e15f6d3044bb744 /tests/net/java/com/android/server/IpSecServiceTest.java | |
| parent | 3d23b908744c5010203b1629ad5bebd60e07f1c6 (diff) | |
Address comments and final cleanup from refcounting integration
Added some extra comments on reference counting and moved a few methods
around. No significant logical changes made in this CL
Bug: 63409385
Test: CTS, Unit tests (both frameworks-base and netd) and binder tests
all pass
Change-Id: I89f1f4a021db48ae406fefefa6aca7406045736c
Diffstat (limited to 'tests/net/java/com/android/server/IpSecServiceTest.java')
| -rw-r--r-- | tests/net/java/com/android/server/IpSecServiceTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/net/java/com/android/server/IpSecServiceTest.java b/tests/net/java/com/android/server/IpSecServiceTest.java index 3eba881df427..582ac275ac56 100644 --- a/tests/net/java/com/android/server/IpSecServiceTest.java +++ b/tests/net/java/com/android/server/IpSecServiceTest.java @@ -166,6 +166,7 @@ public class IpSecServiceTest { mIpSecService.closeUdpEncapsulationSocket(udpEncapResp.resourceId); udpEncapResp.fileDescriptor.close(); + // Verify quota and RefcountedResource objects cleaned up IpSecService.UserRecord userRecord = mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid()); assertEquals(0, userRecord.mSocketQuotaTracker.mCurrent); @@ -179,10 +180,8 @@ public class IpSecServiceTest { @Test public void testUdpEncapsulationSocketBinderDeath() throws Exception { - int localport = findUnusedPort(); - IpSecUdpEncapResponse udpEncapResp = - mIpSecService.openUdpEncapsulationSocket(localport, new Binder()); + mIpSecService.openUdpEncapsulationSocket(0, new Binder()); IpSecService.UserRecord userRecord = mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid()); @@ -192,6 +191,7 @@ public class IpSecServiceTest { refcountedRecord.binderDied(); + // Verify quota and RefcountedResource objects cleaned up assertEquals(0, userRecord.mSocketQuotaTracker.mCurrent); try { userRecord.mEncapSocketRecords.getRefcountedResourceOrThrow(udpEncapResp.resourceId); |