diff options
| author | Jonathan Basseri <misterikkit@google.com> | 2017-11-16 10:58:01 -0800 |
|---|---|---|
| committer | Nathan Harold <nharold@google.com> | 2017-12-12 13:50:35 -0800 |
| commit | 5fb929032de14ca78163e1d0c42c34f6fb287da4 (patch) | |
| tree | 5efce3a17f03238572ddc890a872ea3610be45c7 /tests/net/java/com/android/server/IpSecServiceParameterizedTest.java | |
| parent | 403c8f72e38114d0aadfd852b98b323827068e5b (diff) | |
Use consistent naming for allocating SPI.
Throughout the IPsec code (API, system server, netd) we use "reserve"
SPI and "allocate" SPI interchangeably. This renames to use "allocate"
everywhere for self-consistency and consistency with the kernel
(ALLOCSPI).
In javadoc, I am leaving the word "reserve" in several places because it
is still an accurate description of how the method behaves.
Bug: 69128142
Test: TreeHugger should be enough
Change-Id: I8ea603b4612303b0393beef04032671fa53d2106
Diffstat (limited to 'tests/net/java/com/android/server/IpSecServiceParameterizedTest.java')
| -rw-r--r-- | tests/net/java/com/android/server/IpSecServiceParameterizedTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java index 5c031eb11372..3d57fff9ae28 100644 --- a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java +++ b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java @@ -125,7 +125,7 @@ public class IpSecServiceParameterizedTest { .thenReturn(TEST_SPI_OUT); IpSecSpiResponse spiResp = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( IpSecTransform.DIRECTION_OUT, mRemoteAddr, TEST_SPI_OUT, new Binder()); assertEquals(IpSecManager.Status.OK, spiResp.status); assertEquals(TEST_SPI_OUT, spiResp.spi); @@ -142,7 +142,7 @@ public class IpSecServiceParameterizedTest { .thenReturn(TEST_SPI_OUT); IpSecSpiResponse spiResp = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( IpSecTransform.DIRECTION_OUT, mRemoteAddr, TEST_SPI_OUT, new Binder()); mIpSecService.releaseSecurityParameterIndex(spiResp.resourceId); @@ -162,7 +162,7 @@ public class IpSecServiceParameterizedTest { .thenReturn(returnSpi); IpSecSpiResponse spi = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( direction, NetworkUtils.numericToInetAddress(remoteAddress).getHostAddress(), IpSecManager.INVALID_SECURITY_PARAMETER_INDEX, |