Refactor SaProposal

Make SaProposal abstract and create subclasses IkeSaProposal and
ChildProposal for IKE and Child negotiation separately.

Bug: 142139930
Test: atest FrameworksIkeTests(all passed)
Change-Id: I3bb7ad679228ff6f88e42b18a80ecc9db0576e3e

1 files changed, 2 insertions, 20 deletions

diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java
index 161da31d..32325084 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java
@@ -56,7 +56,7 @@ public final class IkeSessionOptionsTest {
             (Inet4Address) (InetAddressUtils.parseNumericAddress("192.0.2.100"));
 
     private UdpEncapsulationSocket mUdpEncapSocket;
-    private SaProposal mIkeSaProposal;
+    private IkeSaProposal mIkeSaProposal;
     private IkeIdentification mLocalIdentification;
     private IkeIdentification mRemoteIdentification;
 
@@ -67,7 +67,7 @@ public final class IkeSessionOptionsTest {
         mUdpEncapSocket = ipSecManager.openUdpEncapsulationSocket();
 
         mIkeSaProposal =
-                SaProposal.Builder.newIkeSaProposalBuilder()
+                new IkeSaProposal.Builder()
                         .addEncryptionAlgorithm(
                                 SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_8,
                                 SaProposal.KEY_LEN_AES_128)
@@ -180,22 +180,4 @@ public final class IkeSessionOptionsTest {
         } catch (IllegalArgumentException expected) {
         }
     }
-
-    @Test
-    public void testBuildWithChildSaProposal() throws Exception {
-        SaProposal saProposal =
-                SaProposal.Builder.newChildSaProposalBuilder()
-                        .addEncryptionAlgorithm(
-                                SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_8,
-                                SaProposal.KEY_LEN_AES_128)
-                        .build();
-        try {
-            new IkeSessionOptions.Builder(REMOTE_IPV4_ADDRESS, mUdpEncapSocket)
-                    .addSaProposal(saProposal)
-                    .setAuthPsk(PSK)
-                    .build();
-            fail("Expected to fail due to wrong type of SA proposal.");
-        } catch (IllegalArgumentException expected) {
-        }
-    }
 }