Refactor ChildSessionOptions

This commit creates separate classes for transport and tunnel
mode ChildSessionOptions and make ChildSessionOptions abstract

Bug: 140644654
Test: atest FrameworksIkeTests(all tests passed)
Change-Id: I6822568301be5dbc91f138cf242d264a200461ba

3 files changed, 4 insertions, 5 deletions

diff --git a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionOptionsTest.java b/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionOptionsTest.java
index 185848b0..5f8a4fc6 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionOptionsTest.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionOptionsTest.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.fail;
 import org.junit.Test;
 
 public final class ChildSessionOptionsTest {
-
     private static final int NUM_TS = 1;
 
     @Test
@@ -36,7 +35,7 @@ public final class ChildSessionOptionsTest {
                                 SaProposal.KEY_LEN_AES_128)
                         .build();
         ChildSessionOptions sessionOptions =
-                new ChildSessionOptions.Builder().addSaProposal(saProposal).build();
+                new TunnelModeChildSessionOptions.Builder().addSaProposal(saProposal).build();
 
         assertArrayEquals(new SaProposal[] {saProposal}, sessionOptions.getSaProposals());
         assertEquals(NUM_TS, sessionOptions.getLocalTrafficSelectors().length);
@@ -47,7 +46,7 @@ public final class ChildSessionOptionsTest {
     @Test
     public void testBuildWithoutSaProposal() throws Exception {
         try {
-            new ChildSessionOptions.Builder().build();
+            new TunnelModeChildSessionOptions.Builder().build();
             fail("Expected to fail due to the absence of SA proposal.");
         } catch (IllegalArgumentException expected) {
         }
diff --git a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java b/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java
index 81280795..86967f53 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java
@@ -269,7 +269,7 @@ public final class ChildSessionStateMachineTest {
     }
 
     private ChildSessionOptions buildChildSessionOptions() throws Exception {
-        return new ChildSessionOptions.Builder().addSaProposal(buildSaProposal()).build();
+        return new TunnelModeChildSessionOptions.Builder().addSaProposal(buildSaProposal()).build();
     }
 
     private void setUpChildSaRecords() {
diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java
index e2c0c1c2..63332d53 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java
@@ -742,7 +742,7 @@ public final class IkeSessionStateMachineTest {
                         .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA1_96)
                         .build();
 
-        return new ChildSessionOptions.Builder().addSaProposal(saProposal).build();
+        return new TransportModeChildSessionOptions.Builder().addSaProposal(saProposal).build();
     }
 
     private ReceivedIkePacket makeIkeInitResponse() throws Exception {