Merge "Enable ignoring incompleted IPv6 on-link DNS server." into main am: 01778ade8a Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2648608 Change-Id: I14318869c9f296e8f56bfe2e12dd86ca40b5ddc8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp index b8e60df..15b4235 100644 --- a/Android.bp +++ b/Android.bp
@@ -47,7 +47,7 @@ // In some branches, this may be module_current instead of module_34 if the SDK prebuilts are not // yet dropped there, meaning module_34 cannot be used yet. -module_34_version = "module_current" +module_34_version = "module_34" // TODO: remove this default and replace with ConnectivityNextEnableDefaults. This will need to be // done separately in each branch due to merge conflicts.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9fe8b1d..259a403 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml
@@ -16,11 +16,13 @@ * limitations under the License. */ --> + +<!-- versionCode is set to placeholder module version which will + be replaced during build. Do not change it! --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.networkstack" android:sharedUserId="android.uid.networkstack" - android:versionCode="339990000" - android:versionName="339990000" + android:versionCode="0" coreApp="true" > <!--- Defines the MAINLINE_NETWORK_STACK permission used by the networkstack process. -->
diff --git a/AndroidManifest_Next.xml b/AndroidManifest_Next.xml index 200a921..9a09509 100644 --- a/AndroidManifest_Next.xml +++ b/AndroidManifest_Next.xml
@@ -17,7 +17,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.networkstack" android:sharedUserId="android.uid.networkstack" - android:versionCode="339990000" + android:versionCode="0" android:versionName="T-next" coreApp="true"> </manifest>
diff --git a/common/networkstackclient/lint-baseline.xml b/common/networkstackclient/lint-baseline.xml new file mode 100644 index 0000000..046b948 --- /dev/null +++ b/common/networkstackclient/lint-baseline.xml
@@ -0,0 +1,169 @@ +<?xml version="1.0" encoding="UTF-8"?> +<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev"> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.KeepalivePacketData#getDstAddress`" + errorLine1=" final InetAddress dstAddress = pkt.getDstAddress();" + errorLine2=" ~~~~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/common/networkstackclient/src/android/net/util/KeepalivePacketDataUtil.java" + line="54" + column="44"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.KeepalivePacketData#getDstAddress`" + errorLine1=" final InetAddress dstAddress = pkt.getDstAddress();" + errorLine2=" ~~~~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/common/networkstackclient/src/android/net/util/KeepalivePacketDataUtil.java" + line="70" + column="44"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.KeepalivePacketData#getDstAddress`" + errorLine1=" p.dstAddress = data.getDstAddress().getAddress();" + errorLine2=" ~~~~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/common/networkstackclient/src/android/net/util/KeepalivePacketDataUtil.java" + line="136" + column="29"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.KeepalivePacketData#getDstPort`" + errorLine1=" p.dstPort = data.getDstPort();" + errorLine2=" ~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/common/networkstackclient/src/android/net/util/KeepalivePacketDataUtil.java" + line="137" + column="26"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.KeepalivePacketData#getDstPort`" + errorLine1=" parcel.dstPort = pkt.getDstPort();" + errorLine2=" ~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/common/networkstackclient/src/android/net/util/KeepalivePacketDataUtil.java" + line="58" + column="30"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.KeepalivePacketData#getDstPort`" + errorLine1=" parcel.dstPort = pkt.getDstPort();" + errorLine2=" ~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/common/networkstackclient/src/android/net/util/KeepalivePacketDataUtil.java" + line="74" + column="30"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.KeepalivePacketData#getPacket`" + errorLine1=" final ByteBuffer buffer = ByteBuffer.wrap(data.getPacket());" + errorLine2=" ~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/common/networkstackclient/src/android/net/util/KeepalivePacketDataUtil.java" + line="110" + column="56"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.KeepalivePacketData#getSrcAddress`" + errorLine1=" final InetAddress srcAddress = pkt.getSrcAddress();" + errorLine2=" ~~~~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/common/networkstackclient/src/android/net/util/KeepalivePacketDataUtil.java" + line="53" + column="44"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.KeepalivePacketData#getSrcAddress`" + errorLine1=" final InetAddress srcAddress = pkt.getSrcAddress();" + errorLine2=" ~~~~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/common/networkstackclient/src/android/net/util/KeepalivePacketDataUtil.java" + line="69" + column="44"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.KeepalivePacketData#getSrcAddress`" + errorLine1=" p.srcAddress = data.getSrcAddress().getAddress();" + errorLine2=" ~~~~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/common/networkstackclient/src/android/net/util/KeepalivePacketDataUtil.java" + line="134" + column="29"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.KeepalivePacketData#getSrcPort`" + errorLine1=" p.srcPort = data.getSrcPort();" + errorLine2=" ~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/common/networkstackclient/src/android/net/util/KeepalivePacketDataUtil.java" + line="135" + column="26"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.KeepalivePacketData#getSrcPort`" + errorLine1=" parcel.srcPort = pkt.getSrcPort();" + errorLine2=" ~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/common/networkstackclient/src/android/net/util/KeepalivePacketDataUtil.java" + line="56" + column="30"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.KeepalivePacketData#getSrcPort`" + errorLine1=" parcel.srcPort = pkt.getSrcPort();" + errorLine2=" ~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/common/networkstackclient/src/android/net/util/KeepalivePacketDataUtil.java" + line="72" + column="30"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.NetworkStack#getService`" + errorLine1=" while ((nss = NetworkStack.getService()) == null) {" + errorLine2=" ~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/common/networkstackclient/src/android/net/networkstack/ModuleNetworkStackClient.java" + line="87" + column="40"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.NetworkStack#getService`" + errorLine1=" final IBinder nss = NetworkStack.getService();" + errorLine2=" ~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/common/networkstackclient/src/android/net/networkstack/ModuleNetworkStackClient.java" + line="68" + column="42"/> + </issue> + +</issues> \ No newline at end of file
diff --git a/lint-baseline.xml b/lint-baseline.xml new file mode 100644 index 0000000..1517328 --- /dev/null +++ b/lint-baseline.xml
@@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev"> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.CaptivePortalData#getUserPortalUrl`" + errorLine1=" mLinkProperties.getCaptivePortalData().getUserPortalUrl()" + errorLine2=" ~~~~~~~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java" + line="1734" + column="72"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.CaptivePortalData#getUserPortalUrl`" + errorLine1=" mLinkProperties.getCaptivePortalData().getUserPortalUrl()" + errorLine2=" ~~~~~~~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java" + line="1370" + column="64"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.LinkProperties#getCaptivePortalData`" + errorLine1=" mLinkProperties.getCaptivePortalData().getUserPortalUrl()" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java" + line="1734" + column="49"/> + </issue> + + <issue + id="NewApi" + message="Call requires API level 30 (current min is 29): `android.net.LinkProperties#getCaptivePortalData`" + errorLine1=" mLinkProperties.getCaptivePortalData().getUserPortalUrl()" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> + <location + file="packages/modules/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java" + line="1370" + column="41"/> + </issue> + +</issues> \ No newline at end of file
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index eaf0b2e..592b271 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml
@@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="notification_channel_name_connected" msgid="1795068343200033922">"Autentifikacija na zaštitnom portalu"</string> - <string name="notification_channel_description_connected" msgid="7239184168268014518">"Obavijesti koje se prikazuju kada uređaj uspješno prođe provjeru autentičnosti na mreži zaštitnog portala"</string> + <string name="notification_channel_description_connected" msgid="7239184168268014518">"Obavijesti koje se prikazuju kada uređaj uspješno prođe autentifikaciju na mreži zaštitnog portala"</string> <string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"Podaci o mrežnom mjestu"</string> <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Obavijesti koje se prikazuju kada mreža ima stranicu s podacima o mjestu događaja"</string> <string name="connected" msgid="4563643884927480998">"Povezano"</string>
diff --git a/tests/integration/lint-baseline.xml b/tests/integration/lint-baseline.xml index 1868549..edc9dac 100644 --- a/tests/integration/lint-baseline.xml +++ b/tests/integration/lint-baseline.xml
@@ -3,57 +3,42 @@ <issue id="NewApi" - message="Call requires API level R (current min is 29): `android.net.LinkProperties#getDhcpServerAddress`" - errorLine1=" assertEquals(SERVER_ADDR, captor.getValue().getDhcpServerAddress());" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> + message="Call requires API level 30 (current min is 29): `android.net.LinkProperties#getDhcpServerAddress`"> <location file="packages/modules/NetworkStack/tests/integration/common/android/net/ip/IpClientIntegrationTestCommon.java" - line="1513" - column="53"/> + line="1574"/> </issue> <issue id="NewApi" - message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`" - errorLine1=" argThat(lp -> Objects.equals(expected, lp.getNat64Prefix())));" - errorLine2=" ~~~~~~~~~~~~~~"> + message="Call requires API level 30 (current min is 29): `android.net.LinkProperties#getNat64Prefix`"> <location file="packages/modules/NetworkStack/tests/integration/common/android/net/ip/IpClientIntegrationTestCommon.java" - line="1836" - column="59"/> + line="2014"/> </issue> <issue id="NewApi" - message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`" - errorLine1=" lp -> !Objects.equals(unchanged, lp.getNat64Prefix())));" - errorLine2=" ~~~~~~~~~~~~~~"> + message="Call requires API level 30 (current min is 29): `android.net.LinkProperties#getNat64Prefix`"> <location file="packages/modules/NetworkStack/tests/integration/common/android/net/ip/IpClientIntegrationTestCommon.java" - line="1842" - column="53"/> + line="2020"/> </issue> <issue id="NewApi" - message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`" - errorLine1=" if (lp.getNat64Prefix() != null) {" - errorLine2=" ~~~~~~~~~~~~~~"> + message="Call requires API level 30 (current min is 29): `android.net.LinkProperties#getNat64Prefix`"> <location file="packages/modules/NetworkStack/tests/integration/common/android/net/ip/IpClientIntegrationTestCommon.java" - line="1873" - column="16"/> + line="2050"/> </issue> <issue id="NewApi" - message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`" - errorLine1=" assertEquals(prefix, lp.getNat64Prefix());" - errorLine2=" ~~~~~~~~~~~~~~"> + message="Call requires API level 30 (current min is 29): `android.net.LinkProperties#getNat64Prefix`"> <location file="packages/modules/NetworkStack/tests/integration/common/android/net/ip/IpClientIntegrationTestCommon.java" - line="1874" - column="37"/> + line="2051"/> </issue> -</issues> +</issues> \ No newline at end of file
diff --git a/tests/unit/lint-baseline.xml b/tests/unit/lint-baseline.xml index 0bfcaa9..f8b1c29 100644 --- a/tests/unit/lint-baseline.xml +++ b/tests/unit/lint-baseline.xml
@@ -3,79 +3,58 @@ <issue id="NewApi" - message="Call requires API level R (current min is 29): `android.net.NetworkCapabilities()`" - errorLine1=" private val EMPTY_CAPABILITIES = NetworkCapabilities()" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~"> + message="Call requires API level 30 (current min is 29): `android.net.NetworkCapabilities()`"> <location file="packages/modules/NetworkStack/tests/unit/src/com/android/networkstack/NetworkStackNotifierTest.kt" - line="134" - column="38"/> + line="136"/> </issue> <issue id="NewApi" - message="Call requires API level R (current min is 29): `android.net.NetworkCapabilities()`" - errorLine1=" private val VALIDATED_CAPABILITIES = NetworkCapabilities()" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~"> + message="Call requires API level 30 (current min is 29): `android.net.NetworkCapabilities()`"> <location file="packages/modules/NetworkStack/tests/unit/src/com/android/networkstack/NetworkStackNotifierTest.kt" - line="135" - column="42"/> + line="137"/> </issue> <issue id="NewApi" - message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`" - errorLine1=" new NetworkCapabilities()" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~"> + message="Call requires API level 30 (current min is 29): `new android.net.NetworkCapabilities`"> <location file="packages/modules/NetworkStack/tests/unit/src/com/android/networkstack/metrics/NetworkValidationMetricsTest.java" - line="57" - column="13"/> + line="57"/> </issue> <issue id="NewApi" - message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`" - errorLine1=" NetworkCapabilities nc = new NetworkCapabilities();" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~"> + message="Call requires API level 30 (current min is 29): `new android.net.NetworkCapabilities`"> <location file="packages/modules/NetworkStack/tests/unit/src/com/android/networkstack/metrics/NetworkValidationMetricsTest.java" - line="109" - column="34"/> + line="109"/> </issue> <issue id="NewApi" - message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`" - errorLine1=" nc = new NetworkCapabilities();" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~"> + message="Call requires API level 30 (current min is 29): `new android.net.NetworkCapabilities`"> <location file="packages/modules/NetworkStack/tests/unit/src/com/android/networkstack/metrics/NetworkValidationMetricsTest.java" - line="117" - column="14"/> + line="117"/> </issue> <issue id="NewApi" - message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`" - errorLine1=" nc = new NetworkCapabilities();" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~"> + message="Call requires API level 30 (current min is 29): `new android.net.NetworkCapabilities`"> <location file="packages/modules/NetworkStack/tests/unit/src/com/android/networkstack/metrics/NetworkValidationMetricsTest.java" - line="123" - column="14"/> + line="123"/> </issue> <issue id="NewApi" - message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`" - errorLine1=" nc = new NetworkCapabilities();" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~"> + message="Call requires API level 30 (current min is 29): `new android.net.NetworkCapabilities`"> <location file="packages/modules/NetworkStack/tests/unit/src/com/android/networkstack/metrics/NetworkValidationMetricsTest.java" - line="129" - column="14"/> + line="129"/> </issue> -</issues> +</issues> \ No newline at end of file