Merge "Rename create/delete transform methods" am: 7ee26e72cf (5b3e7889) · Commits · e / os / android_frameworks_base

core/java/android/net/IIpSecService.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -39,9 +39,9 @@ interface IIpSecService

		void closeUdpEncapsulationSocket(int resourceId);

		IpSecTransformResponse createTransportModeTransform(in IpSecConfig c, in IBinder binder);
		IpSecTransformResponse createTransform(in IpSecConfig c, in IBinder binder);

		void deleteTransportModeTransform(int transformId);
		void deleteTransform(int transformId);

		void applyTransportModeTransform(in ParcelFileDescriptor socket, int direction, int transformId);

core/java/android/net/IpSecTransform.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -124,8 +124,7 @@ public final class IpSecTransform implements AutoCloseable {
		synchronized (this) {
		try {
		IIpSecService svc = getIpSecService();
		IpSecTransformResponse result =
		svc.createTransportModeTransform(mConfig, new Binder());
		IpSecTransformResponse result = svc.createTransform(mConfig, new Binder());
		int status = result.status;
		checkResultStatus(status);
		mResourceId = result.resourceId;
		@@ -170,7 +169,7 @@ public final class IpSecTransform implements AutoCloseable {
		* still want to clear out the transform.
		*/
		IIpSecService svc = getIpSecService();
		svc.deleteTransportModeTransform(mResourceId);
		svc.deleteTransform(mResourceId);
		stopKeepalive();
		} catch (RemoteException e) {
		throw e.rethrowAsRuntimeException();

services/core/java/com/android/server/IpSecService.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -1105,10 +1105,10 @@ public class IpSecService extends IIpSecService.Stub {
		* receive data.
		*/
		@Override
		public synchronized IpSecTransformResponse createTransportModeTransform(
		IpSecConfig c, IBinder binder) throws RemoteException {
		public synchronized IpSecTransformResponse createTransform(IpSecConfig c, IBinder binder)
		throws RemoteException {
		checkIpSecConfig(c);
		checkNotNull(binder, "Null Binder passed to createTransportModeTransform");
		checkNotNull(binder, "Null Binder passed to createTransform");
		final int resourceId = mNextResourceId++;

		UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid());
		@@ -1186,7 +1186,7 @@ public class IpSecService extends IIpSecService.Stub {
		* other reasons.
		*/
		@Override
		public synchronized void deleteTransportModeTransform(int resourceId) throws RemoteException {
		public synchronized void deleteTransform(int resourceId) throws RemoteException {
		UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid());
		releaseResource(userRecord.mTransformRecords, resourceId);
		}

tests/net/java/com/android/server/IpSecServiceParameterizedTest.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -204,13 +204,13 @@ public class IpSecServiceParameterizedTest {
		}

		@Test
		public void testCreateTransportModeTransform() throws Exception {
		public void testCreateTransform() throws Exception {
		IpSecConfig ipSecConfig = new IpSecConfig();
		addDefaultSpisAndRemoteAddrToIpSecConfig(ipSecConfig);
		addAuthAndCryptToIpSecConfig(ipSecConfig);

		IpSecTransformResponse createTransformResp =
		mIpSecService.createTransportModeTransform(ipSecConfig, new Binder());
		mIpSecService.createTransform(ipSecConfig, new Binder());
		assertEquals(IpSecManager.Status.OK, createTransformResp.status);

		verify(mMockNetd)
		@@ -236,14 +236,14 @@ public class IpSecServiceParameterizedTest {
		}

		@Test
		public void testCreateTransportModeTransformAead() throws Exception {
		public void testCreateTransformAead() throws Exception {
		IpSecConfig ipSecConfig = new IpSecConfig();
		addDefaultSpisAndRemoteAddrToIpSecConfig(ipSecConfig);

		ipSecConfig.setAuthenticatedEncryption(AEAD_ALGO);

		IpSecTransformResponse createTransformResp =
		mIpSecService.createTransportModeTransform(ipSecConfig, new Binder());
		mIpSecService.createTransform(ipSecConfig, new Binder());
		assertEquals(IpSecManager.Status.OK, createTransformResp.status);

		verify(mMockNetd)
		@@ -269,14 +269,14 @@ public class IpSecServiceParameterizedTest {
		}

		@Test
		public void testDeleteTransportModeTransform() throws Exception {
		public void testDeleteTransform() throws Exception {
		IpSecConfig ipSecConfig = new IpSecConfig();
		addDefaultSpisAndRemoteAddrToIpSecConfig(ipSecConfig);
		addAuthAndCryptToIpSecConfig(ipSecConfig);

		IpSecTransformResponse createTransformResp =
		mIpSecService.createTransportModeTransform(ipSecConfig, new Binder());
		mIpSecService.deleteTransportModeTransform(createTransformResp.resourceId);
		mIpSecService.createTransform(ipSecConfig, new Binder());
		mIpSecService.deleteTransform(createTransformResp.resourceId);

		verify(mMockNetd)
		.ipSecDeleteSecurityAssociation(
		@@ -302,7 +302,7 @@ public class IpSecServiceParameterizedTest {
		addAuthAndCryptToIpSecConfig(ipSecConfig);

		IpSecTransformResponse createTransformResp =
		mIpSecService.createTransportModeTransform(ipSecConfig, new Binder());
		mIpSecService.createTransform(ipSecConfig, new Binder());

		IpSecService.UserRecord userRecord =
		mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid());
		@@ -334,7 +334,7 @@ public class IpSecServiceParameterizedTest {
		addAuthAndCryptToIpSecConfig(ipSecConfig);

		IpSecTransformResponse createTransformResp =
		mIpSecService.createTransportModeTransform(ipSecConfig, new Binder());
		mIpSecService.createTransform(ipSecConfig, new Binder());
		ParcelFileDescriptor pfd = ParcelFileDescriptor.fromSocket(new Socket());

		int resourceId = createTransformResp.resourceId;

tests/net/java/com/android/server/IpSecServiceTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -412,9 +412,9 @@ public class IpSecServiceTest {
		}

		@Test
		public void testDeleteInvalidTransportModeTransform() throws Exception {
		public void testDeleteInvalidTransform() throws Exception {
		try {
		mIpSecService.deleteTransportModeTransform(1);
		mIpSecService.deleteTransform(1);
		fail("IllegalArgumentException not thrown");
		} catch (IllegalArgumentException e) {
		}