LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: 675ec9d30e

Browse Source 
Change-Id: I58b6863e5f8417368c7cd83edc487404d5156e99
This commit is contained in:
Remi NGUYEN VAN
2020-04-30 06:19:07 +00:00
committed by Automerger Merge Worker
parent ec45939bda a530ebb62d
commit d24ff42f00
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tethering/src/android/net/dhcp/DhcpServingParamsParcelExt.java
View File

@@ -169,7 +169,7 @@ public class DhcpServingParamsParcelExt extends DhcpServingParamsParcel {
* <p>If not set, the default value is null. * <p>If not set, the default value is null.
*/ */
public DhcpServingParamsParcelExt setSingleClientAddr(@Nullable Inet4Address clientAddr) { public DhcpServingParamsParcelExt setSingleClientAddr(@Nullable Inet4Address clientAddr) {
this.clientAddr = clientAddr == null ? 0 : inet4AddressToIntHTH(clientAddr); this.singleClientAddr = clientAddr == null ? 0 : inet4AddressToIntHTH(clientAddr);
return this; return this;
} }

2
Tethering/tests/unit/src/android/net/dhcp/DhcpServingParamsParcelExtTest.java
View File

@@ -110,7 +110,7 @@ public class DhcpServingParamsParcelExtTest {
@Test @Test
public void testSetClientAddr() { public void testSetClientAddr() {
mParcel.setSingleClientAddr(TEST_CLIENT_ADDRESS); mParcel.setSingleClientAddr(TEST_CLIENT_ADDRESS);
assertEquals(TEST_CLIENT_ADDRESS_PARCELED, mParcel.clientAddr); assertEquals(TEST_CLIENT_ADDRESS_PARCELED, mParcel.singleClientAddr);
} }
private static Inet4Address inet4Addr(String addr) { private static Inet4Address inet4Addr(String addr) {

2
Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java
View File

@@ -1689,7 +1689,7 @@ public class TetheringTest {
final DhcpServingParamsParcel params = dhcpParamsCaptor.getValue(); final DhcpServingParamsParcel params = dhcpParamsCaptor.getValue();
assertEquals(serverAddr, intToInet4AddressHTH(params.serverAddr).getHostAddress()); assertEquals(serverAddr, intToInet4AddressHTH(params.serverAddr).getHostAddress());
assertEquals(24, params.serverAddrPrefixLength); assertEquals(24, params.serverAddrPrefixLength);
assertEquals(clientAddrParceled, params.clientAddr); assertEquals(clientAddrParceled, params.singleClientAddr);
} }
@Test @Test