| commit | 8ef111750207ff8dc2c843c0b5d5914d4c3de98b | [log] [tgz] |
|---|---|---|
| author | Motomu Utsumi <[email protected]> | Wed Jun 08 03:20:38 2022 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Wed Jun 08 03:20:38 2022 +0000 |
| tree | 58a7bb2ead48efa3ffd42a79004f411e81c97339 | |
| parent | d7004481ec3d177faa723ac7bf75c671dffca214 [diff] | |
| parent | aa53b4790ad3ff9bf095f1ddef2ccbddc80eee3c [diff] |
Merge "Add 3rd deny firewall chain for OEM" into tm-dev am: aa53b4790a Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/18769671 Change-Id: I763dcb2678b8b776f4df09e1fb9ec2b9488a9db7 Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/service/ServiceConnectivityResources/res/values-or/strings.xml b/service/ServiceConnectivityResources/res/values-or/strings.xml index 49a773a..8b85884 100644 --- a/service/ServiceConnectivityResources/res/values-or/strings.xml +++ b/service/ServiceConnectivityResources/res/values-or/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="connectivityResourcesAppLabel" msgid="2476261877900882974">"ସିଷ୍ଟମ କନେକ୍ଟିଭିଟୀ ରିସୋର୍ସ"</string> + <string name="connectivityResourcesAppLabel" msgid="2476261877900882974">"ସିଷ୍ଟମର ସଂଯୋଗ ସମ୍ବନ୍ଧିତ ରିସୋର୍ସଗୁଡ଼ିକ"</string> <string name="wifi_available_sign_in" msgid="8041178343789805553">"ୱାଇ-ଫାଇ ନେଟୱର୍କରେ ସାଇନ୍-ଇନ୍ କରନ୍ତୁ"</string> <string name="network_available_sign_in" msgid="2622520134876355561">"ନେଟ୍ୱର୍କରେ ସାଇନ୍ ଇନ୍ କରନ୍ତୁ"</string> <!-- no translation found for network_available_sign_in_detailed (8439369644697866359) -->
diff --git a/service/ServiceConnectivityResources/res/values-sq/strings.xml b/service/ServiceConnectivityResources/res/values-sq/strings.xml index 85bd84f..385c75c 100644 --- a/service/ServiceConnectivityResources/res/values-sq/strings.xml +++ b/service/ServiceConnectivityResources/res/values-sq/strings.xml
@@ -35,7 +35,7 @@ <string-array name="network_switch_type_name"> <item msgid="3004933964374161223">"të dhënat celulare"</item> <item msgid="5624324321165953608">"Wi-Fi"</item> - <item msgid="5667906231066981731">"Bluetooth-i"</item> + <item msgid="5667906231066981731">"Bluetooth"</item> <item msgid="346574747471703768">"Eternet"</item> <item msgid="5734728378097476003">"VPN"</item> </string-array>
diff --git a/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt b/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt index 293da67..a694f01 100644 --- a/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt +++ b/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
@@ -366,7 +366,6 @@ SystemProperties.getInt("service.adb.tcp.port", -1) > -1) } - @Ignore("TODO: temporarily ignore tests until prebuilts are updated") @Test fun testCallbacks_forServerModeInterfaces() { // do not run this test when adb might be connected over ethernet.