commit 4470e63558e1ebc1121b30aecb8c97936ef9bb60
author Xiao Ma <xiaom@google.com> Wed Apr 21 03:30:36 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 21 03:30:36 2021 +0000
tree b38934fc017c2cf2b8bab5a8e5117d355459ad80
parent 8dac8044b3afacb8122a5092e6fbd4eeaee2d40b
parent cec6e218fe7fc0ddb9483931532a611af968a8c7

Merge "Fix the failure testCustomizedDhcpOptions_disallowedOption." am: f47788f76e am: 834f9cceb8 am: cec6e218fe

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1679674

Change-Id: Idcb5bd313730ef141079af3df60205bda5fde882

src/android/net/dhcp/DhcpPacket.java

diff --git a/src/android/net/dhcp/DhcpPacket.java b/src/android/net/dhcp/DhcpPacket.java
index f70f3ec..1331a24 100644
--- a/src/android/net/dhcp/DhcpPacket.java
+++ b/src/android/net/dhcp/DhcpPacket.java
@@ -200,7 +200,8 @@
      * DHCP Optional Type: DHCP Interface MTU
      */
     public static final byte DHCP_MTU = 26;
-    protected Short mMtu;
+    @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
+    public Short mMtu;
 
     /**
      * DHCP Optional Type: DHCP BROADCAST ADDRESS

tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java

diff --git a/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java b/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java
index ae68362..9dd97ff 100644
--- a/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java
+++ b/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java
@@ -135,6 +135,7 @@
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.internal.util.HexDump;
 import com.android.internal.util.StateMachine;
 import com.android.net.module.util.ArrayTrackRecord;
 import com.android.net.module.util.Ipv6Utils;
@@ -2748,8 +2749,8 @@
         final List<DhcpOption> options = Arrays.asList(
                 makeDhcpOption((byte) 60, TEST_OEM_VENDOR_ID.getBytes()),
                 makeDhcpOption((byte) 77, TEST_OEM_USER_CLASS_INFO),
-                // DHCP_HOST_NAME
-                makeDhcpOption((byte) 12, new String("Pixel 3 XL").getBytes()));
+                // Option 26: MTU
+                makeDhcpOption((byte) 26, HexDump.toByteArray(TEST_DEFAULT_MTU)));
         final ScanResultInfo info = makeScanResultInfo(0xdd /* vendor-specificIE */, TEST_OEM_OUI,
                 (byte) 0x17 /* vendor-specific IE type */);
         final DhcpPacket packet = doCustomizedDhcpOptionsTest(options, info);
@@ -2757,7 +2758,7 @@
         assertTrue(packet instanceof DhcpDiscoverPacket);
         assertEquals(packet.mVendorId, TEST_OEM_VENDOR_ID);
         assertArrayEquals(packet.mUserClass, TEST_OEM_USER_CLASS_INFO);
-        assertNull(packet.mHostName);
+        assertNull(packet.mMtu);
     }
 
     @Test