Merge changes I38628dad,I2467b647 into rvc-dev
* changes:
[SP18.1] add dependency object to OffloadController
[SP18] Poll network stats in OffloadController to support data warning
diff --git a/Tethering/src/android/net/dhcp/DhcpServingParamsParcelExt.java b/Tethering/src/android/net/dhcp/DhcpServingParamsParcelExt.java
index 82a26be..4f8ad8a 100644
--- a/Tethering/src/android/net/dhcp/DhcpServingParamsParcelExt.java
+++ b/Tethering/src/android/net/dhcp/DhcpServingParamsParcelExt.java
@@ -169,7 +169,7 @@
* <p>If not set, the default value is null.
*/
public DhcpServingParamsParcelExt setSingleClientAddr(@Nullable Inet4Address clientAddr) {
- this.clientAddr = clientAddr == null ? 0 : inet4AddressToIntHTH(clientAddr);
+ this.singleClientAddr = clientAddr == null ? 0 : inet4AddressToIntHTH(clientAddr);
return this;
}
diff --git a/Tethering/tests/unit/src/android/net/dhcp/DhcpServingParamsParcelExtTest.java b/Tethering/tests/unit/src/android/net/dhcp/DhcpServingParamsParcelExtTest.java
index f8eb147..a8857b2 100644
--- a/Tethering/tests/unit/src/android/net/dhcp/DhcpServingParamsParcelExtTest.java
+++ b/Tethering/tests/unit/src/android/net/dhcp/DhcpServingParamsParcelExtTest.java
@@ -110,7 +110,7 @@
@Test
public void testSetClientAddr() {
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) {
diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java
index 0c86eeb..0363f5f 100644
--- a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java
+++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java
@@ -1689,7 +1689,7 @@
final DhcpServingParamsParcel params = dhcpParamsCaptor.getValue();
assertEquals(serverAddr, intToInet4AddressHTH(params.serverAddr).getHostAddress());
assertEquals(24, params.serverAddrPrefixLength);
- assertEquals(clientAddrParceled, params.clientAddr);
+ assertEquals(clientAddrParceled, params.singleClientAddr);
}
@Test