Merge "Fix the failure testCustomizedDhcpOptions_disallowedOption." am: f47788f76e am: 834f9cceb8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1679674
Change-Id: I51072099c54b6d6ea02e3d37bbdce04f3afb5e76
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
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