diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-22 23:27:12 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-22 23:27:12 +0000 |
commit | a43b62a68e4ace4e11bbfbc5ad3a90fdc75e1236 (patch) | |
tree | f252dff34ca2b10c01f7d799ef89effdf85d33e1 | |
parent | 7fa753a99d01be2c81f1e44f8f19693957071e1d (diff) | |
parent | 264c7064e4742775b7601d78021dc412fd927d51 (diff) | |
download | Connectivity-a43b62a68e4ace4e11bbfbc5ad3a90fdc75e1236.tar.gz |
Snap for 9095712 from 264c7064e4742775b7601d78021dc412fd927d51 to tm-qpr1-release
Change-Id: I942f32fe10a0e7cae554fbdb0a326c548edc0d8c
4 files changed, 6 insertions, 5 deletions
diff --git a/nearby/halfsheet/res/values-ro/strings.xml b/nearby/halfsheet/res/values-ro/strings.xml index dbd0ffb531..189f698dd9 100644 --- a/nearby/halfsheet/res/values-ro/strings.xml +++ b/nearby/halfsheet/res/values-ro/strings.xml @@ -23,7 +23,7 @@ <string name="fast_pair_title_fail" msgid="5677174346601290232">"Nu s-a putut conecta"</string> <string name="paring_action_done" msgid="6888875159174470731">"Gata"</string> <string name="paring_action_save" msgid="6259357442067880136">"Salvează"</string> - <string name="paring_action_connect" msgid="4801102939608129181">"Conectați"</string> + <string name="paring_action_connect" msgid="4801102939608129181">"Conectează"</string> <string name="paring_action_launch" msgid="8940808384126591230">"Configurează"</string> <string name="paring_action_settings" msgid="424875657242864302">"Setări"</string> </resources> diff --git a/service/ServiceConnectivityResources/res/values-kk/strings.xml b/service/ServiceConnectivityResources/res/values-kk/strings.xml index 00c0f3926e..efe23b6210 100644 --- a/service/ServiceConnectivityResources/res/values-kk/strings.xml +++ b/service/ServiceConnectivityResources/res/values-kk/strings.xml @@ -33,7 +33,7 @@ <string name="network_switch_metered_detail" msgid="1257300152739542096">"Құрылғы <xliff:g id="PREVIOUS_NETWORK">%2$s</xliff:g> желісінде интернетпен байланыс жоғалған жағдайда <xliff:g id="NEW_NETWORK">%1$s</xliff:g> желісін пайдаланады. Деректер ақысы алынуы мүмкін."</string> <string name="network_switch_metered_toast" msgid="70691146054130335">"<xliff:g id="PREVIOUS_NETWORK">%1$s</xliff:g> желісінен <xliff:g id="NEW_NETWORK">%2$s</xliff:g> желісіне ауысты"</string> <string-array name="network_switch_type_name"> - <item msgid="3004933964374161223">"мобильдік деректер"</item> + <item msgid="3004933964374161223">"мобильдік интернет"</item> <item msgid="5624324321165953608">"Wi-Fi"</item> <item msgid="5667906231066981731">"Bluetooth"</item> <item msgid="346574747471703768">"Ethernet"</item> diff --git a/service/ServiceConnectivityResources/res/values-ro/strings.xml b/service/ServiceConnectivityResources/res/values-ro/strings.xml index 152c225476..4ff529001f 100644 --- a/service/ServiceConnectivityResources/res/values-ro/strings.xml +++ b/service/ServiceConnectivityResources/res/values-ro/strings.xml @@ -18,8 +18,8 @@ <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">"Resurse pentru conectivitatea sistemului"</string> - <string name="wifi_available_sign_in" msgid="8041178343789805553">"Conectați-vă la rețeaua Wi-Fi"</string> - <string name="network_available_sign_in" msgid="2622520134876355561">"Conectați-vă la rețea"</string> + <string name="wifi_available_sign_in" msgid="8041178343789805553">"Conectează-te la rețeaua Wi-Fi"</string> + <string name="network_available_sign_in" msgid="2622520134876355561">"Conectează-te la rețea"</string> <!-- no translation found for network_available_sign_in_detailed (8439369644697866359) --> <skip /> <string name="wifi_no_internet" msgid="1326348603404555475">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> nu are acces la internet"</string> diff --git a/tests/unit/java/com/android/server/connectivity/VpnTest.java b/tests/unit/java/com/android/server/connectivity/VpnTest.java index b0440d5c3c..597b9a6a65 100644 --- a/tests/unit/java/com/android/server/connectivity/VpnTest.java +++ b/tests/unit/java/com/android/server/connectivity/VpnTest.java @@ -837,7 +837,8 @@ public class VpnTest { // Restricted users cannot configure VPNs assertThrows(SecurityException.class, () -> vpn.setAppExclusionList(TEST_VPN_PKG, new ArrayList<>())); - assertThrows(SecurityException.class, () -> vpn.getAppExclusionList(TEST_VPN_PKG)); + + assertEquals(Arrays.asList(PKGS), vpn.getAppExclusionList(TEST_VPN_PKG)); } @Test |