Merge changes from topic "xfrmi-support" am: f928c1e4b9 am: 4b7bb9f374

am: b71b2aefef Change-Id: I9c543d38c88181b12cdbc7bdb93d7e38f1dfd425
2018-11-25 19:38:35 -08:00
parent baca8b7647 b71b2aefef
commit c1f747bb5e
2 changed files with 52 additions and 4 deletions
--- a/tests/net/java/android/net/IpSecConfigTest.java
+++ b/tests/net/java/android/net/IpSecConfigTest.java
@@ -47,6 +47,7 @@ public class IpSecConfigTest {
        assertNull(c.getEncryption());
        assertNull(c.getAuthentication());
        assertEquals(IpSecManager.INVALID_RESOURCE_ID, c.getSpiResourceId());
+        assertEquals(0, c.getXfrmInterfaceId());
    }

    private IpSecConfig getSampleConfig() {
@@ -77,6 +78,7 @@ public class IpSecConfigTest {
        c.setNattKeepaliveInterval(42);
        c.setMarkValue(12);
        c.setMarkMask(23);
+        c.setXfrmInterfaceId(34);

        return c;
    }