Snap for 9239618 from e99060ac9133e790e94830ef2f6625fe9eae19b4 to tm-platform-release Change-Id: I24c81548cdd4fa12696d3bc6938e380c0a774f42
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d616750..2bd3de0 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="339990000" - android:versionName="339990000" + android:versionCode="330400000" + android:versionName="330400000" coreApp="true" > <!--- Defines the MAINLINE_NETWORK_STACK permission used by the networkstack process. -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index feda547..61a7149 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml
@@ -21,6 +21,6 @@ <string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"Informații despre locația rețelei"</string> <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Notificări afișate pentru a indica faptul că o rețea are o pagină cu informații despre locație"</string> <string name="connected" msgid="4563643884927480998">"Conectată"</string> - <string name="tap_for_info" msgid="6849746325626883711">"Conectat / atingeți pentru a vedea site-ul"</string> + <string name="tap_for_info" msgid="6849746325626883711">"Conectat / atinge pentru a vedea site-ul"</string> <string name="application_label" msgid="1322847171305285454">"Manager de rețea"</string> </resources>
diff --git a/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java b/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java index 2f3987c..1c161fe 100644 --- a/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java +++ b/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java
@@ -186,7 +186,6 @@ import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName; @@ -3792,7 +3791,6 @@ verify(mCb, timeout(TEST_TIMEOUT_MS)).setNeighborDiscoveryOffload(true); } - @Ignore("TODO: temporarily ignore tests until prebuilts are updated") @Test @SignatureRequiredTest(reason = "requires mock callback object") public void testNetlinkSocketReceiveENOBUFS() throws Exception { if (!mIsNetlinkEventParseEnabled) return;