Add a shim for registerDefaultNetworkCallbackAsUid. am: 83a64b862b am: 89412a115e Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1669268 Change-Id: I3f0d26e25e8a1bf45df61c899838229cc546d868
diff --git a/Android.bp b/Android.bp index ec62226..2daa1d4 100644 --- a/Android.bp +++ b/Android.bp
@@ -47,7 +47,7 @@ // Whether to enable the targets in this file that target current SDKs. // Set to false in branches like mainline-prod where API classes are too old to build current code. -enable_current_sdk_targets = true +enable_current_sdk_targets = false java_defaults { name: "NetworkStackDevApiLevel",
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b61c89f..55357a8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml
@@ -19,8 +19,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.networkstack" android:sharedUserId="android.uid.networkstack" - android:versionCode="300900700" - android:versionName="r_aml_300900700" + android:versionCode="309999900" + android:versionName="r_aml_309999900" > <!-- Permissions must be defined here, and not in the base manifest, as the network stack running in the system server process does not need any permission, and having privileged
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 527d895..7b54302 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml
@@ -17,9 +17,9 @@ <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">"Verificatie van captive portal"</string> - <string name="notification_channel_description_connected" msgid="7239184168268014518">"Er worden meldingen weergegeven als het apparaat is geverifieerd voor een captive portal-netwerk"</string> + <string name="notification_channel_description_connected" msgid="7239184168268014518">"Er worden meldingen getoond als het apparaat is geverifieerd voor een captive portal-netwerk"</string> <string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"Netwerklocatie-informatie"</string> - <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Er worden meldingen weergegeven om aan te geven dat het netwerk een locatie-informatiepagina heeft"</string> + <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Er worden meldingen getoond om aan te geven dat het netwerk een locatie-informatiepagina heeft"</string> <string name="connected" msgid="4563643884927480998">"Verbonden"</string> <string name="tap_for_info" msgid="6849746325626883711">"Verbonden / Tik om de website te bekijken"</string> <string name="application_label" msgid="1322847171305285454">"Netwerkbeheer"</string>
diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp index 875b089..2cffc3d 100644 --- a/tests/integration/Android.bp +++ b/tests/integration/Android.bp
@@ -87,6 +87,7 @@ certificate: "networkstack", platform_apis: true, test_suites: ["device-tests"], + enabled: false, // Disabled in mainline-prod } // The static lib needs to be jarjared by each module so they do not conflict with each other
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp index c0c6276..e308b96 100644 --- a/tests/unit/Android.bp +++ b/tests/unit/Android.bp
@@ -58,6 +58,7 @@ defaults: ["NetworkStackTestsDefaults"], static_libs: ["NetworkStackApiCurrentLib"], compile_multilib: "both", // Workaround for b/147785146 for mainline-presubmit + enabled: false, // Disabled in mainline-prod } // Library containing the unit tests. This is used by the coverage test target to pull in the