From 60a3a6905f4368288a8965a75c027af02875ccd3 Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Mon, 11 Dec 2023 14:53:05 +0900 Subject: [PATCH 01/19] Resolve Android.bp conflicts between ump and other branches This CL is a prepaation to remove TrunkStable.bp aosp/2867895 will remove TrunkStable.bp. Bug: 315302281 Test: TH Merged-In: I44c111577643bacb35b532cb156a61d30cfea31a Change-Id: I74403737d207f880ce11156106aab7ebc3bd42e0 --- common/Android.bp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/Android.bp b/common/Android.bp index 6d04b6ca6d..1d73a46af5 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -19,6 +19,8 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } +build = ["TrunkStable.bp"] + // This is a placeholder comment to avoid merge conflicts // as the above target may not exist // depending on the branch From 22f829799b815d75b68d55c2c5d286302389e7e3 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 13 Dec 2023 12:15:41 -0800 Subject: [PATCH 02/19] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I24926cde52f631b64b75a74d6e96ff8f8807c121 --- nearby/halfsheet/res/values-fr-rCA/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nearby/halfsheet/res/values-fr-rCA/strings.xml b/nearby/halfsheet/res/values-fr-rCA/strings.xml index 9a48890861..06913029f7 100644 --- a/nearby/halfsheet/res/values-fr-rCA/strings.xml +++ b/nearby/halfsheet/res/values-fr-rCA/strings.xml @@ -19,7 +19,7 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Démarrage de la configuration…" "Configurer l\'appareil" - "Appareil associé" + "Appareil connecté" "Connecté à l\'appareil suivant : « %s »" "Impossible d\'associer" "Échec de la connexion" From b1850fdf16b1d2eed0947581e90279011d8dc9b5 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 13 Dec 2023 12:17:34 -0800 Subject: [PATCH 03/19] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ief81ccae797e722207f7842b5f8ca1b135e72009 --- service/ServiceConnectivityResources/res/values-as/strings.xml | 2 +- service/ServiceConnectivityResources/res/values-kn/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/service/ServiceConnectivityResources/res/values-as/strings.xml b/service/ServiceConnectivityResources/res/values-as/strings.xml index 19afb59d5e..a3c2c28226 100644 --- a/service/ServiceConnectivityResources/res/values-as/strings.xml +++ b/service/ServiceConnectivityResources/res/values-as/strings.xml @@ -18,7 +18,7 @@ "ছিষ্টেম সংযোগৰ উৎস" - "ৱাই-ফাই নেটৱৰ্কত ছাইন ইন কৰক" + "Wi-Fi নেটৱৰ্কত ছাইন ইন কৰক" "নেটৱৰ্কত ছাইন ইন কৰক" diff --git a/service/ServiceConnectivityResources/res/values-kn/strings.xml b/service/ServiceConnectivityResources/res/values-kn/strings.xml index 98c7df4c03..044aff6756 100644 --- a/service/ServiceConnectivityResources/res/values-kn/strings.xml +++ b/service/ServiceConnectivityResources/res/values-kn/strings.xml @@ -33,7 +33,7 @@ "%1$s ಸೀಮಿತ ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಿಕೆಯನ್ನು ಹೊಂದಿದೆ" "ಹೇಗಾದರೂ ಸಂಪರ್ಕಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ" "%1$s ಗೆ ಬದಲಾಯಿಸಲಾಗಿದೆ" - "%2$s ಇಂಟರ್ನೆಟ್ ಪ್ರವೇಶ ಹೊಂದಿಲ್ಲದಿರುವಾಗ, ಸಾಧನವು %1$s ಬಳಸುತ್ತದೆ. ಶುಲ್ಕಗಳು ಅನ್ವಯವಾಗಬಹುದು." + "%2$s ಇಂಟರ್ನೆಟ್ ಆ್ಯಕ್ಸೆಸ್ ಹೊಂದಿಲ್ಲದಿರುವಾಗ, ಸಾಧನವು %1$s ಬಳಸುತ್ತದೆ. ಶುಲ್ಕಗಳು ಅನ್ವಯವಾಗಬಹುದು." "%1$s ರಿಂದ %2$s ಗೆ ಬದಲಾಯಿಸಲಾಗಿದೆ" "ಮೊಬೈಲ್ ಡೇಟಾ" From 63f2b09c54beec8062d9d185a517223c13b1eeef Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 13 Dec 2023 12:22:45 -0800 Subject: [PATCH 04/19] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I1cf780b4f6044a18700b5b61fecd44ddda274c96 --- Tethering/res/values-af/strings.xml | 20 +++++++++---------- Tethering/res/values-am/strings.xml | 20 +++++++++---------- Tethering/res/values-ar/strings.xml | 20 +++++++++---------- Tethering/res/values-as/strings.xml | 20 +++++++++---------- Tethering/res/values-az/strings.xml | 20 +++++++++---------- Tethering/res/values-b+sr+Latn/strings.xml | 20 +++++++++---------- Tethering/res/values-be/strings.xml | 20 +++++++++---------- Tethering/res/values-bg/strings.xml | 20 +++++++++---------- Tethering/res/values-bn/strings.xml | 20 +++++++++---------- Tethering/res/values-bs/strings.xml | 20 +++++++++---------- Tethering/res/values-ca/strings.xml | 20 +++++++++---------- Tethering/res/values-cs/strings.xml | 20 +++++++++---------- Tethering/res/values-da/strings.xml | 20 +++++++++---------- Tethering/res/values-de/strings.xml | 20 +++++++++---------- Tethering/res/values-el/strings.xml | 20 +++++++++---------- Tethering/res/values-en-rAU/strings.xml | 20 +++++++++---------- Tethering/res/values-en-rCA/strings.xml | 20 +++++++++---------- Tethering/res/values-en-rGB/strings.xml | 20 +++++++++---------- Tethering/res/values-en-rIN/strings.xml | 20 +++++++++---------- Tethering/res/values-en-rXC/strings.xml | 20 +++++++++---------- Tethering/res/values-es-rUS/strings.xml | 20 +++++++++---------- Tethering/res/values-es/strings.xml | 20 +++++++++---------- Tethering/res/values-et/strings.xml | 20 +++++++++---------- Tethering/res/values-eu/strings.xml | 20 +++++++++---------- Tethering/res/values-fa/strings.xml | 20 +++++++++---------- Tethering/res/values-fi/strings.xml | 20 +++++++++---------- Tethering/res/values-fr-rCA/strings.xml | 20 +++++++++---------- Tethering/res/values-fr/strings.xml | 20 +++++++++---------- Tethering/res/values-gl/strings.xml | 20 +++++++++---------- Tethering/res/values-gu/strings.xml | 20 +++++++++---------- Tethering/res/values-hi/strings.xml | 20 +++++++++---------- Tethering/res/values-hr/strings.xml | 20 +++++++++---------- Tethering/res/values-hu/strings.xml | 20 +++++++++---------- Tethering/res/values-hy/strings.xml | 20 +++++++++---------- Tethering/res/values-in/strings.xml | 20 +++++++++---------- Tethering/res/values-is/strings.xml | 20 +++++++++---------- Tethering/res/values-it/strings.xml | 20 +++++++++---------- Tethering/res/values-iw/strings.xml | 20 +++++++++---------- Tethering/res/values-ja/strings.xml | 20 +++++++++---------- Tethering/res/values-ka/strings.xml | 20 +++++++++---------- Tethering/res/values-kk/strings.xml | 20 +++++++++---------- Tethering/res/values-km/strings.xml | 20 +++++++++---------- Tethering/res/values-kn/strings.xml | 20 +++++++++---------- Tethering/res/values-ko/strings.xml | 20 +++++++++---------- Tethering/res/values-ky/strings.xml | 20 +++++++++---------- Tethering/res/values-lo/strings.xml | 20 +++++++++---------- Tethering/res/values-lt/strings.xml | 20 +++++++++---------- Tethering/res/values-lv/strings.xml | 20 +++++++++---------- .../res/values-mcc310-mnc004-af/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-am/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-ar/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-as/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-az/strings.xml | 10 +++++----- .../strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-be/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-bg/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-bn/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-bs/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-ca/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-cs/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-da/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-de/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-el/strings.xml | 10 +++++----- .../values-mcc310-mnc004-en-rAU/strings.xml | 10 +++++----- .../values-mcc310-mnc004-en-rCA/strings.xml | 10 +++++----- .../values-mcc310-mnc004-en-rGB/strings.xml | 10 +++++----- .../values-mcc310-mnc004-en-rIN/strings.xml | 10 +++++----- .../values-mcc310-mnc004-en-rXC/strings.xml | 10 +++++----- .../values-mcc310-mnc004-es-rUS/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-es/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-et/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-eu/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-fa/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-fi/strings.xml | 10 +++++----- .../values-mcc310-mnc004-fr-rCA/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-fr/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-gl/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-gu/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-hi/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-hr/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-hu/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-hy/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-in/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-is/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-it/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-iw/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-ja/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-ka/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-kk/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-km/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-kn/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-ko/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-ky/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-lo/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-lt/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-lv/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-mk/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-ml/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-mn/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-mr/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-ms/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-my/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-nb/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-ne/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-nl/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-or/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-pa/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-pl/strings.xml | 10 +++++----- .../values-mcc310-mnc004-pt-rBR/strings.xml | 10 +++++----- .../values-mcc310-mnc004-pt-rPT/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-pt/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-ro/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-ru/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-si/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-sk/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-sl/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-sq/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-sr/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-sv/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-sw/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-ta/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-te/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-th/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-tl/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-tr/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-uk/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-ur/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-uz/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-vi/strings.xml | 10 +++++----- .../values-mcc310-mnc004-zh-rCN/strings.xml | 10 +++++----- .../values-mcc310-mnc004-zh-rHK/strings.xml | 10 +++++----- .../values-mcc310-mnc004-zh-rTW/strings.xml | 10 +++++----- .../res/values-mcc310-mnc004-zu/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-af/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-am/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-ar/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-as/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-az/strings.xml | 10 +++++----- .../strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-be/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-bg/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-bn/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-bs/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-ca/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-cs/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-da/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-de/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-el/strings.xml | 10 +++++----- .../values-mcc311-mnc480-en-rAU/strings.xml | 10 +++++----- .../values-mcc311-mnc480-en-rCA/strings.xml | 10 +++++----- .../values-mcc311-mnc480-en-rGB/strings.xml | 10 +++++----- .../values-mcc311-mnc480-en-rIN/strings.xml | 10 +++++----- .../values-mcc311-mnc480-en-rXC/strings.xml | 10 +++++----- .../values-mcc311-mnc480-es-rUS/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-es/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-et/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-eu/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-fa/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-fi/strings.xml | 10 +++++----- .../values-mcc311-mnc480-fr-rCA/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-fr/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-gl/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-gu/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-hi/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-hr/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-hu/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-hy/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-in/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-is/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-it/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-iw/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-ja/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-ka/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-kk/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-km/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-kn/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-ko/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-ky/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-lo/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-lt/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-lv/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-mk/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-ml/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-mn/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-mr/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-ms/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-my/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-nb/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-ne/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-nl/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-or/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-pa/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-pl/strings.xml | 10 +++++----- .../values-mcc311-mnc480-pt-rBR/strings.xml | 10 +++++----- .../values-mcc311-mnc480-pt-rPT/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-pt/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-ro/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-ru/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-si/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-sk/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-sl/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-sq/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-sr/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-sv/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-sw/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-ta/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-te/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-th/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-tl/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-tr/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-uk/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-ur/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-uz/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-vi/strings.xml | 10 +++++----- .../values-mcc311-mnc480-zh-rCN/strings.xml | 10 +++++----- .../values-mcc311-mnc480-zh-rHK/strings.xml | 10 +++++----- .../values-mcc311-mnc480-zh-rTW/strings.xml | 10 +++++----- .../res/values-mcc311-mnc480-zu/strings.xml | 10 +++++----- Tethering/res/values-mk/strings.xml | 20 +++++++++---------- Tethering/res/values-ml/strings.xml | 20 +++++++++---------- Tethering/res/values-mn/strings.xml | 20 +++++++++---------- Tethering/res/values-mr/strings.xml | 20 +++++++++---------- Tethering/res/values-ms/strings.xml | 20 +++++++++---------- Tethering/res/values-my/strings.xml | 20 +++++++++---------- Tethering/res/values-nb/strings.xml | 20 +++++++++---------- Tethering/res/values-ne/strings.xml | 20 +++++++++---------- Tethering/res/values-nl/strings.xml | 20 +++++++++---------- Tethering/res/values-or/strings.xml | 20 +++++++++---------- Tethering/res/values-pa/strings.xml | 20 +++++++++---------- Tethering/res/values-pl/strings.xml | 20 +++++++++---------- Tethering/res/values-pt-rBR/strings.xml | 20 +++++++++---------- Tethering/res/values-pt-rPT/strings.xml | 20 +++++++++---------- Tethering/res/values-pt/strings.xml | 20 +++++++++---------- Tethering/res/values-ro/strings.xml | 20 +++++++++---------- Tethering/res/values-ru/strings.xml | 20 +++++++++---------- Tethering/res/values-si/strings.xml | 20 +++++++++---------- Tethering/res/values-sk/strings.xml | 20 +++++++++---------- Tethering/res/values-sl/strings.xml | 20 +++++++++---------- Tethering/res/values-sq/strings.xml | 20 +++++++++---------- Tethering/res/values-sr/strings.xml | 20 +++++++++---------- Tethering/res/values-sv/strings.xml | 20 +++++++++---------- Tethering/res/values-sw/strings.xml | 20 +++++++++---------- Tethering/res/values-ta/strings.xml | 20 +++++++++---------- Tethering/res/values-te/strings.xml | 20 +++++++++---------- Tethering/res/values-th/strings.xml | 20 +++++++++---------- Tethering/res/values-tl/strings.xml | 20 +++++++++---------- Tethering/res/values-tr/strings.xml | 20 +++++++++---------- Tethering/res/values-uk/strings.xml | 20 +++++++++---------- Tethering/res/values-ur/strings.xml | 20 +++++++++---------- Tethering/res/values-uz/strings.xml | 20 +++++++++---------- Tethering/res/values-vi/strings.xml | 20 +++++++++---------- Tethering/res/values-zh-rCN/strings.xml | 20 +++++++++---------- Tethering/res/values-zh-rHK/strings.xml | 20 +++++++++---------- Tethering/res/values-zh-rTW/strings.xml | 20 +++++++++---------- Tethering/res/values-zu/strings.xml | 20 +++++++++---------- 255 files changed, 1700 insertions(+), 1700 deletions(-) diff --git a/Tethering/res/values-af/strings.xml b/Tethering/res/values-af/strings.xml index 056168b12e..37901426ae 100644 --- a/Tethering/res/values-af/strings.xml +++ b/Tethering/res/values-af/strings.xml @@ -16,14 +16,14 @@ - "Verbinding of warmkol is aktief" - "Tik om op te stel." - "Verbinding is gedeaktiveer" - "Kontak jou administrateur vir besonderhede" - "Warmkol- en verbindingstatus" - - - - - + "Verbinding of warmkol is aktief" + "Tik om op te stel." + "Verbinding is gedeaktiveer" + "Kontak jou admin vir besonderhede" + "Warmkol- en verbindingstatus" + + + + + diff --git a/Tethering/res/values-am/strings.xml b/Tethering/res/values-am/strings.xml index ac468dd144..bb89d6e81f 100644 --- a/Tethering/res/values-am/strings.xml +++ b/Tethering/res/values-am/strings.xml @@ -16,14 +16,14 @@ - "እንደ ሞደም መሰካት ወይም መገናኛ ነጥብ ገባሪ" - "ለማዋቀር መታ ያድርጉ።" - "እንደ ሞደም መሰካት ተሰናክሏል" - "ለዝርዝሮች የእርስዎን አስተዳዳሪ ያነጋግሩ" - "መገናኛ ነጥብ እና እንደ ሞደም የመሰካት ሁኔታ" - - - - - + "እንደ ሞደም መሰካት ወይም መገናኛ ነጥብ ገባሪ" + "ለማዋቀር መታ ያድርጉ።" + "እንደ ሞደም መሰካት ተሰናክሏል" + "ለዝርዝሮች የእርስዎን አስተዳዳሪ ያነጋግሩ" + "መገናኛ ነጥብ እና እንደ ሞደም የመሰካት ሁኔታ" + + + + + diff --git a/Tethering/res/values-ar/strings.xml b/Tethering/res/values-ar/strings.xml index 7d5bad34da..ef98a0192a 100644 --- a/Tethering/res/values-ar/strings.xml +++ b/Tethering/res/values-ar/strings.xml @@ -16,14 +16,14 @@ - "النطاق نشط أو نقطة الاتصال نشطة" - "انقر للإعداد." - "التوصيل متوقف." - "تواصَل مع المشرف للحصول على التفاصيل." - "حالة نقطة الاتصال والتوصيل" - - - - - + "نقطة التوصيل نشطة أو الاتصال نشط" + "انقر لإعداد التوصيل." + "التوصيل غير مفعَّل" + "تواصَل مع المشرف للحصول على التفاصيل." + "حالة نقطة الاتصال والتوصيل" + + + + + diff --git a/Tethering/res/values-as/strings.xml b/Tethering/res/values-as/strings.xml index 091350455b..9b9e8d6201 100644 --- a/Tethering/res/values-as/strings.xml +++ b/Tethering/res/values-as/strings.xml @@ -16,14 +16,14 @@ - "টে\'ডাৰিং অথবা হ\'টস্প\'ট সক্ৰিয় অৱস্থাত আছে" - "ছেট আপ কৰিবলৈ টিপক।" - "টে\'ডাৰিঙৰ সুবিধাটো অক্ষম কৰি থোৱা হৈছে" - "সবিশেষ জানিবলৈ আপোনাৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক" - "হ’টস্প\'ট আৰু টে\'ডাৰিঙৰ স্থিতি" - - - - - + "টে’ডাৰিং অথবা হ’টস্প’ট সক্ৰিয় অৱস্থাত আছে" + "ছেট আপ কৰিবলৈ টিপক।" + "টে’ডাৰিঙৰ সুবিধাটো অক্ষম কৰি থোৱা হৈছে" + "সবিশেষ জানিবলৈ আপোনাৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক" + "হ’টস্প’ট আৰু টে’ডাৰিঙৰ স্থিতি" + + + + + diff --git a/Tethering/res/values-az/strings.xml b/Tethering/res/values-az/strings.xml index dce70da178..b091f151fa 100644 --- a/Tethering/res/values-az/strings.xml +++ b/Tethering/res/values-az/strings.xml @@ -16,14 +16,14 @@ - "Birləşmə və ya hotspot aktivdir" - "Ayarlamaq üçün toxunun." - "Birləşmə deaktivdir" - "Detallar üçün adminlə əlaqə saxlayın" - "Hotspot & birləşmə statusu" - - - - - + "Modem rejimi və ya hotspot aktivdir" + "Ayarlamaq üçün toxunun." + "Modem rejimi deaktivdir" + "Detallar üçün adminlə əlaqə saxlayın" + "Hotspot və modem rejimi statusu" + + + + + diff --git a/Tethering/res/values-b+sr+Latn/strings.xml b/Tethering/res/values-b+sr+Latn/strings.xml index b0774ec9a8..aa6c6fda60 100644 --- a/Tethering/res/values-b+sr+Latn/strings.xml +++ b/Tethering/res/values-b+sr+Latn/strings.xml @@ -16,14 +16,14 @@ - "Privezivanje ili hotspot je aktivan" - "Dodirnite da biste podesili." - "Privezivanje je onemogućeno" - "Potražite detalje od administratora" - "Status hotspota i privezivanja" - - - - - + "Aktivno je privezivanje ili hotspot" + "Dodirnite da biste podesili." + "Privezivanje je onemogućeno" + "Potražite detalje od administratora" + "Status hotspota i privezivanja" + + + + + diff --git a/Tethering/res/values-be/strings.xml b/Tethering/res/values-be/strings.xml index a8acebe2e9..5da882824a 100644 --- a/Tethering/res/values-be/strings.xml +++ b/Tethering/res/values-be/strings.xml @@ -16,14 +16,14 @@ - "Мадэм або хот-спот актыўныя" - "Дакраніцеся, каб наладзіць." - "Рэжым мадэма выключаны" - "Звярніцеся да адміністратара па падрабязную інфармацыю" - "Стан \"Хот-спот і мадэм\"" - - - - - + "Мадэм або хот-спот актыўныя" + "Націсніце, каб наладзіць." + "Рэжым мадэма выключаны" + "Звярніцеся да адміністратара па падрабязную інфармацыю" + "Стан \"Хот-спот і мадэм\"" + + + + + diff --git a/Tethering/res/values-bg/strings.xml b/Tethering/res/values-bg/strings.xml index 94fb2d8f17..0ce2ac77a5 100644 --- a/Tethering/res/values-bg/strings.xml +++ b/Tethering/res/values-bg/strings.xml @@ -16,14 +16,14 @@ - "Има активна споделена връзка или точка за достъп" - "Докоснете, за да настроите." - "Функцията за тетъринг е деактивирана" - "Свържете се с администратора си за подробности" - "Състояние на функцията за точка за достъп и тетъринг" - - - - - + "Има активна споделена връзка или точка за достъп" + "Докоснете, за да настроите." + "Функцията за тетъринг е деактивирана" + "Свържете се с администратора си за подробности" + "Състояние на функцията за точка за достъп и тетъринг" + + + + + diff --git a/Tethering/res/values-bn/strings.xml b/Tethering/res/values-bn/strings.xml index aea02b9ddf..787a65c2e3 100644 --- a/Tethering/res/values-bn/strings.xml +++ b/Tethering/res/values-bn/strings.xml @@ -16,14 +16,14 @@ - "টিথারিং বা হটস্পট চালু আছে" - "সেট-আপ করতে ট্যাপ করুন।" - "টিথারিং বন্ধ করা আছে" - "বিশদে জানতে অ্যাডমিনের সাথে যোগাযোগ করুন" - "হটস্পট ও টিথারিং স্ট্যাটাস" - - - - - + "টেথারিং বা হটস্পট অ্যাক্টিভ আছে" + "সেট-আপ করতে ট্যাপ করুন।" + "টেথারিং বন্ধ করা আছে" + "বিস্তারিত বিবরণ পেতে, অ্যাডমিনের সাথে যোগাযোগ করুন" + "হটস্পট ও টেথারিং সংক্রান্ত স্ট্যাটাস" + + + + + diff --git a/Tethering/res/values-bs/strings.xml b/Tethering/res/values-bs/strings.xml index de232724c5..b6073fdbef 100644 --- a/Tethering/res/values-bs/strings.xml +++ b/Tethering/res/values-bs/strings.xml @@ -16,14 +16,14 @@ - "Aktivno je povezivanje putem mobitela ili pristupna tačka" - "Dodirnite da postavite." - "Povezivanje putem mobitela je onemogućeno" - "Kontaktirajte svog administratora za detalje" - "Status pristupne tačke i povezivanja putem mobitela" - - - - - + "Dijeljenje internetske veze ili pristupna tačka su aktivni" + "Dodirnite da postavite." + "Dijeljenje internetske veze je onemogućeno" + "Kontaktirajte administratora za detalje" + "Status pristupne tačke i dijeljenja internetske veze" + + + + + diff --git a/Tethering/res/values-ca/strings.xml b/Tethering/res/values-ca/strings.xml index 88b795c1f8..2513989c92 100644 --- a/Tethering/res/values-ca/strings.xml +++ b/Tethering/res/values-ca/strings.xml @@ -16,14 +16,14 @@ - "Compartició de xarxa o punt d\'accés Wi‑Fi actius" - "Toca per configurar." - "La compartició de xarxa està desactivada" - "Contacta amb el teu administrador per obtenir més informació" - "Estat del punt d\'accés Wi‑Fi i de la compartició de xarxa" - - - - - + "Compartició de xarxa o punt d\'accés Wi‑Fi actius" + "Toca per configurar." + "La compartició de xarxa està desactivada" + "Contacta amb el teu administrador per obtenir més informació" + "Estat del punt d\'accés Wi‑Fi i de la compartició de xarxa" + + + + + diff --git a/Tethering/res/values-cs/strings.xml b/Tethering/res/values-cs/strings.xml index 8c1b83bf3e..a74991562a 100644 --- a/Tethering/res/values-cs/strings.xml +++ b/Tethering/res/values-cs/strings.xml @@ -16,14 +16,14 @@ - "Tethering nebo hotspot je aktivní" - "Klepnutím zahájíte nastavení." - "Tethering je zakázán" - "O podrobnosti požádejte administrátora" - "Stav hotspotu a tetheringu" - - - - - + "Tethering nebo hotspot je aktivní" + "Klepnutím ho nastavíte." + "Tethering je zakázán" + "O podrobnosti požádejte administrátora" + "Stav hotspotu a tetheringu" + + + + + diff --git a/Tethering/res/values-da/strings.xml b/Tethering/res/values-da/strings.xml index f413e70548..dddf0971ae 100644 --- a/Tethering/res/values-da/strings.xml +++ b/Tethering/res/values-da/strings.xml @@ -16,14 +16,14 @@ - "Netdeling eller hotspot er aktivt" - "Tryk for at konfigurere." - "Netdeling er deaktiveret" - "Kontakt din administrator for at få oplysninger" - "Status for hotspot og netdeling" - - - - - + "Netdeling eller hotspot er aktiveret" + "Tryk for at konfigurere." + "Netdeling er deaktiveret" + "Kontakt din administrator for at få oplysninger" + "Status for hotspot og netdeling" + + + + + diff --git a/Tethering/res/values-de/strings.xml b/Tethering/res/values-de/strings.xml index f057d7824e..ab7b8c9471 100644 --- a/Tethering/res/values-de/strings.xml +++ b/Tethering/res/values-de/strings.xml @@ -16,14 +16,14 @@ - "Tethering oder Hotspot aktiv" - "Zum Einrichten tippen." - "Tethering ist deaktiviert" - "Bitte wende dich für weitere Informationen an den Administrator" - "Hotspot- und Tethering-Status" - - - - - + "Tethering oder Hotspot aktiv" + "Zum Einrichten tippen." + "Tethering ist deaktiviert" + "Bitte wende dich für weitere Informationen an den Administrator" + "Hotspot- und Tethering-Status" + + + + + diff --git a/Tethering/res/values-el/strings.xml b/Tethering/res/values-el/strings.xml index b3c986bdaf..4ed3ec5802 100644 --- a/Tethering/res/values-el/strings.xml +++ b/Tethering/res/values-el/strings.xml @@ -16,14 +16,14 @@ - "Πρόσδεση ή σύνδεση σημείου πρόσβασης ενεργή" - "Πατήστε για ρύθμιση." - "Η σύνδεση είναι απενεργοποιημένη" - "Επικοινωνήστε με τον διαχειριστή σας για λεπτομέρειες" - "Κατάσταση σημείου πρόσβασης Wi-Fi και σύνδεσης" - - - - - + "Ενεργή σύνδεση ή ενεργό σημείο πρόσβασης Wi-Fi" + "Πατήστε για ρύθμιση." + "Η σύνδεση είναι απενεργοποιημένη" + "Επικοινωνήστε με τον διαχειριστή για λεπτομέρειες" + "Κατάσταση σημείου πρόσβασης Wi-Fi και σύνδεσης" + + + + + diff --git a/Tethering/res/values-en-rAU/strings.xml b/Tethering/res/values-en-rAU/strings.xml index 769e01208a..2dc76892c5 100644 --- a/Tethering/res/values-en-rAU/strings.xml +++ b/Tethering/res/values-en-rAU/strings.xml @@ -16,14 +16,14 @@ - "Tethering or hotspot active" - "Tap to set up." - "Tethering is disabled" - "Contact your admin for details" - "Hotspot and tethering status" - - - - - + "Tethering or hotspot active" + "Tap to set up." + "Tethering is disabled" + "Contact your admin for details" + "Hotspot and tethering status" + + + + + diff --git a/Tethering/res/values-en-rCA/strings.xml b/Tethering/res/values-en-rCA/strings.xml index 769e01208a..066cd82ecf 100644 --- a/Tethering/res/values-en-rCA/strings.xml +++ b/Tethering/res/values-en-rCA/strings.xml @@ -16,14 +16,14 @@ - "Tethering or hotspot active" - "Tap to set up." - "Tethering is disabled" - "Contact your admin for details" - "Hotspot and tethering status" - - - - - + "Tethering or hotspot active" + "Tap to set up." + "Tethering is disabled" + "Contact your admin for details" + "Hotspot & tethering status" + + + + + diff --git a/Tethering/res/values-en-rGB/strings.xml b/Tethering/res/values-en-rGB/strings.xml index 769e01208a..2dc76892c5 100644 --- a/Tethering/res/values-en-rGB/strings.xml +++ b/Tethering/res/values-en-rGB/strings.xml @@ -16,14 +16,14 @@ - "Tethering or hotspot active" - "Tap to set up." - "Tethering is disabled" - "Contact your admin for details" - "Hotspot and tethering status" - - - - - + "Tethering or hotspot active" + "Tap to set up." + "Tethering is disabled" + "Contact your admin for details" + "Hotspot and tethering status" + + + + + diff --git a/Tethering/res/values-en-rIN/strings.xml b/Tethering/res/values-en-rIN/strings.xml index 769e01208a..2dc76892c5 100644 --- a/Tethering/res/values-en-rIN/strings.xml +++ b/Tethering/res/values-en-rIN/strings.xml @@ -16,14 +16,14 @@ - "Tethering or hotspot active" - "Tap to set up." - "Tethering is disabled" - "Contact your admin for details" - "Hotspot and tethering status" - - - - - + "Tethering or hotspot active" + "Tap to set up." + "Tethering is disabled" + "Contact your admin for details" + "Hotspot and tethering status" + + + + + diff --git a/Tethering/res/values-en-rXC/strings.xml b/Tethering/res/values-en-rXC/strings.xml index f1674bed4e..a83caac4cf 100644 --- a/Tethering/res/values-en-rXC/strings.xml +++ b/Tethering/res/values-en-rXC/strings.xml @@ -16,14 +16,14 @@ - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎Tethering or hotspot active‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎Tap to set up.‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‎Tethering is disabled‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎Contact your admin for details‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎Hotspot & tethering status‎‏‎‎‏‎" - - - - - + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎Tethering or hotspot active‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎Tap to set up.‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎Tethering is disabled‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‎Contact your admin for details‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‏‎‎‎‏‎‎‎‎‏‏‏‏‎‎‏‎Hotspot & tethering status‎‏‎‎‏‎" + + + + + diff --git a/Tethering/res/values-es-rUS/strings.xml b/Tethering/res/values-es-rUS/strings.xml index 63689f4399..69bd4e760d 100644 --- a/Tethering/res/values-es-rUS/strings.xml +++ b/Tethering/res/values-es-rUS/strings.xml @@ -16,14 +16,14 @@ - "Conexión a red o hotspot conectados" - "Presiona para configurar esta opción." - "Se inhabilitó la conexión mediante dispositivo portátil" - "Para obtener más información, comunícate con el administrador" - "Estado del hotspot y la conexión mediante dispositivo portátil" - - - - - + "Conexión mediante dispositivo móvil o hotspot activos" + "Presiona para configurar esta opción." + "Se inhabilitó la conexión mediante dispositivo móvil" + "Para obtener más información, comunícate con el administrador" + "Estado del hotspot y de la conexión mediante dispositivo portátil" + + + + + diff --git a/Tethering/res/values-es/strings.xml b/Tethering/res/values-es/strings.xml index 9a34ed5e38..6bef387bab 100644 --- a/Tethering/res/values-es/strings.xml +++ b/Tethering/res/values-es/strings.xml @@ -16,14 +16,14 @@ - "Conexión compartida o punto de acceso activos" - "Toca para configurar." - "La conexión compartida está inhabilitada" - "Solicita más información a tu administrador" - "Estado del punto de acceso y de la conexión compartida" - - - - - + "Conexión compartida o punto de acceso activos" + "Toca para configurarla." + "La conexión compartida está inhabilitada" + "Ponte en contacto con el administrador para obtener más información" + "Estado del punto de acceso y la conexión compartida" + + + + + diff --git a/Tethering/res/values-et/strings.xml b/Tethering/res/values-et/strings.xml index 0970341ab0..68088cef25 100644 --- a/Tethering/res/values-et/strings.xml +++ b/Tethering/res/values-et/strings.xml @@ -16,14 +16,14 @@ - "Jagamine või kuumkoht on aktiivne" - "Puudutage seadistamiseks." - "Jagamine on keelatud" - "Lisateabe saamiseks võtke ühendust oma administraatoriga" - "Kuumkoha ja jagamise olek" - - - - - + "Jagamine või kuumkoht on aktiivne" + "Puudutage seadistamiseks." + "Jagamine on keelatud" + "Lisateabe saamiseks võtke ühendust oma administraatoriga" + "Kuumkoha ja jagamise olek" + + + + + diff --git a/Tethering/res/values-eu/strings.xml b/Tethering/res/values-eu/strings.xml index 632019e2ef..37b35a8bfa 100644 --- a/Tethering/res/values-eu/strings.xml +++ b/Tethering/res/values-eu/strings.xml @@ -16,14 +16,14 @@ - "Konexioa partekatzea edo wifi-gunea aktibo dago" - "Sakatu konfiguratzeko." - "Desgaituta dago konexioa partekatzeko aukera" - "Xehetasunak lortzeko, jarri administratzailearekin harremanetan" - "Wifi-gunearen eta konexioa partekatzeko eginbidearen egoera" - - - - - + "Konexioa partekatzeko aukera edo wifi-gunea aktibo dago" + "Konfiguratzeko, sakatu hau." + "Konexioa partekatzeko aukera desgaituta dago" + "Xehetasunak lortzeko, jarri administratzailearekin harremanetan" + "Wifi-gunearen eta konexioa partekatzeko aukeraren egoera" + + + + + diff --git a/Tethering/res/values-fa/strings.xml b/Tethering/res/values-fa/strings.xml index 2e21c85fa1..d7f254359f 100644 --- a/Tethering/res/values-fa/strings.xml +++ b/Tethering/res/values-fa/strings.xml @@ -16,14 +16,14 @@ - "اشتراک‌گذاری اینترنت یا نقطه اتصال فعال" - "برای راه‌اندازی ضربه بزنید." - "اشتراک‌گذاری اینترنت غیرفعال است" - "برای جزئیات، با سرپرستتان تماس بگیرید" - "وضعیت نقطه اتصال و اشتراک‌گذاری اینترنت" - - - - - + "اشتراک‌گذاری اینترنت یا نقطه اتصال فعال است" + "برای راه‌اندازی، ضربه بزنید." + "اشتراک‌گذاری اینترنت غیرفعال است" + "برای جزئیات، با سرپرستتان تماس بگیرید" + "وضعیت نقطه اتصال و اشتراک‌گذاری اینترنت" + + + + + diff --git a/Tethering/res/values-fi/strings.xml b/Tethering/res/values-fi/strings.xml index 413db3f0f8..4bf09fecef 100644 --- a/Tethering/res/values-fi/strings.xml +++ b/Tethering/res/values-fi/strings.xml @@ -16,14 +16,14 @@ - "Yhteyden jakaminen tai hotspot käytössä" - "Ota käyttöön napauttamalla." - "Yhteyden jakaminen on poistettu käytöstä" - "Pyydä lisätietoja järjestelmänvalvojalta" - "Hotspotin ja yhteyden jakamisen tila" - - - - - + "Puhelimen käyttäminen modeemina tai hotspot käytössä" + "Ota käyttöön napauttamalla." + "Puhelimen käyttäminen modeemina on poistettu käytöstä" + "Pyydä lisätietoa järjestelmänvalvojalta" + "Hotspotin ja modeemina toimivan puhelimen tila" + + + + + diff --git a/Tethering/res/values-fr-rCA/strings.xml b/Tethering/res/values-fr-rCA/strings.xml index eb2e4ba540..66b4684efd 100644 --- a/Tethering/res/values-fr-rCA/strings.xml +++ b/Tethering/res/values-fr-rCA/strings.xml @@ -16,14 +16,14 @@ - "Partage de connexion ou point d\'accès sans fil activé" - "Touchez pour configurer." - "Le partage de connexion est désactivé" - "Communiquez avec votre administrateur pour obtenir plus de détails" - "Point d\'accès et partage de connexion" - - - - - + "Partage de connexion ou point d\'accès sans fil activé" + "Touchez pour configurer." + "Le partage de connexion est désactivé" + "Communiquez avec votre administrateur pour obtenir plus de détails" + "État du point d\'accès sans fil et du partage de connexion" + + + + + diff --git a/Tethering/res/values-fr/strings.xml b/Tethering/res/values-fr/strings.xml index 22259c52ab..9440d95b47 100644 --- a/Tethering/res/values-fr/strings.xml +++ b/Tethering/res/values-fr/strings.xml @@ -16,14 +16,14 @@ - "Partage de connexion ou point d\'accès activé" - "Appuyez pour effectuer la configuration." - "Le partage de connexion est désactivé" - "Pour en savoir plus, contactez votre administrateur" - "État du point d\'accès et du partage de connexion" - - - - - + "Partage de connexion ou point d\'accès activé" + "Appuyez pour configurer." + "Le partage de connexion est désactivé" + "Pour en savoir plus, contactez votre administrateur" + "État du point d\'accès et du partage de connexion" + + + + + diff --git a/Tethering/res/values-gl/strings.xml b/Tethering/res/values-gl/strings.xml index ded82fcd54..74bb7f2864 100644 --- a/Tethering/res/values-gl/strings.xml +++ b/Tethering/res/values-gl/strings.xml @@ -16,14 +16,14 @@ - "Conexión compartida ou zona wifi activada" - "Toca para configurar." - "A conexión compartida está desactivada" - "Contacta co administrador para obter información" - "Estado da zona wifi e da conexión compartida" - - - - - + "Conexión compartida ou zona wifi activada" + "Toca para configurar." + "A conexión compartida está desactivada" + "Contacta co administrador para obter información" + "Estado da zona wifi e da conexión compartida" + + + + + diff --git a/Tethering/res/values-gu/strings.xml b/Tethering/res/values-gu/strings.xml index 7cbbc2de3d..c4634999d6 100644 --- a/Tethering/res/values-gu/strings.xml +++ b/Tethering/res/values-gu/strings.xml @@ -16,14 +16,14 @@ - "ઇન્ટરનેટ શેર કરવાની સુવિધા અથવા હૉટસ્પૉટ સક્રિય છે" - "સેટઅપ કરવા માટે ટૅપ કરો." - "ઇન્ટરનેટ શેર કરવાની સુવિધા બંધ કરી છે" - "વિગતો માટે તમારા વ્યવસ્થાપકનો સંપર્ક કરો" - "હૉટસ્પૉટ અને ઇન્ટરનેટ શેર કરવાની સુવિધાનું સ્ટેટસ" - - - - - + "ઇન્ટરનેટ શેર કરવાની સુવિધા અથવા હૉટસ્પૉટ સક્રિય છે" + "સેટઅપ કરવા માટે ટૅપ કરો." + "ઇન્ટરનેટ શેર કરવાની સુવિધા બંધ કરી છે" + "વિગતો માટે તમારા ઍડમિનનો સંપર્ક કરો" + "હૉટસ્પૉટ અને ઇન્ટરનેટ શેર કરવાની સુવિધાનું સ્ટેટસ" + + + + + diff --git a/Tethering/res/values-hi/strings.xml b/Tethering/res/values-hi/strings.xml index 08af81b826..12f7961dc0 100644 --- a/Tethering/res/values-hi/strings.xml +++ b/Tethering/res/values-hi/strings.xml @@ -16,14 +16,14 @@ - "टेदरिंग या हॉटस्पॉट चालू है" - "सेट अप करने के लिए टैप करें." - "टेदरिंग बंद है" - "जानकारी के लिए अपने एडमिन से संपर्क करें" - "हॉटस्पॉट और टेदरिंग की स्थिति" - - - - - + "टेदरिंग या हॉटस्पॉट चालू है" + "सेट अप करने के लिए टैप करें." + "टेदरिंग बंद है" + "जानकारी के लिए अपने एडमिन से संपर्क करें" + "हॉटस्पॉट और टेदरिंग की स्थिति" + + + + + diff --git a/Tethering/res/values-hr/strings.xml b/Tethering/res/values-hr/strings.xml index 827c135f20..19b7b45b07 100644 --- a/Tethering/res/values-hr/strings.xml +++ b/Tethering/res/values-hr/strings.xml @@ -16,14 +16,14 @@ - "Modemsko povezivanje ili žarišna točka aktivni" - "Dodirnite da biste postavili." - "Modemsko je povezivanje onemogućeno" - "Obratite se administratoru da biste saznali pojedinosti" - "Status žarišne točke i modemskog povezivanja" - - - - - + "Modemsko povezivanje ili žarišna točka aktivni" + "Dodirnite da biste ih postavili." + "Modemsko je povezivanje onemogućeno" + "Obratite se administratoru da biste saznali pojedinosti" + "Status žarišne točke i modemskog povezivanja" + + + + + diff --git a/Tethering/res/values-hu/strings.xml b/Tethering/res/values-hu/strings.xml index eb68d6babf..419f434ad8 100644 --- a/Tethering/res/values-hu/strings.xml +++ b/Tethering/res/values-hu/strings.xml @@ -16,14 +16,14 @@ - "Megosztás vagy aktív hotspot" - "Koppintson a beállításhoz." - "Az internetmegosztás le van tiltva" - "A részletekért forduljon rendszergazdájához" - "Hotspot és internetmegosztás állapota" - - - - - + "Az internetmegosztás vagy a hotspot aktív" + "Koppintson a beállításhoz." + "Az internetmegosztás le van tiltva" + "A részletekért forduljon rendszergazdájához" + "Hotspot és internetmegosztás állapota" + + + + + diff --git a/Tethering/res/values-hy/strings.xml b/Tethering/res/values-hy/strings.xml index 912941e538..c8842b6880 100644 --- a/Tethering/res/values-hy/strings.xml +++ b/Tethering/res/values-hy/strings.xml @@ -16,14 +16,14 @@ - "Մոդեմի ռեժիմը միացված է" - "Հպեք՝ կարգավորելու համար։" - "Մոդեմի ռեժիմն անջատված է" - "Մանրամասների համար դիմեք ձեր ադմինիստրատորին" - "Թեժ կետի և մոդեմի ռեժիմի կարգավիճակը" - - - - - + "Մոդեմի ռեժիմը միացված է" + "Հպեք՝ կարգավորելու համար։" + "Մոդեմի ռեժիմն անջատված է" + "Մանրամասների համար դիմեք ձեր ադմինիստրատորին" + "Թեժ կետի և մոդեմի ռեժիմի կարգավիճակը" + + + + + diff --git a/Tethering/res/values-in/strings.xml b/Tethering/res/values-in/strings.xml index a4e175a439..4ae35d43a7 100644 --- a/Tethering/res/values-in/strings.xml +++ b/Tethering/res/values-in/strings.xml @@ -16,14 +16,14 @@ - "Tethering atau hotspot aktif" - "Ketuk untuk menyiapkan." - "Tethering dinonaktifkan" - "Hubungi admin untuk mengetahui detailnya" - "Status hotspot & tethering" - - - - - + "Tethering atau hotspot aktif" + "Ketuk untuk menyiapkan." + "Tethering dinonaktifkan" + "Hubungi admin untuk mengetahui detailnya" + "Status hotspot & tethering" + + + + + diff --git a/Tethering/res/values-is/strings.xml b/Tethering/res/values-is/strings.xml index e9f6670bcd..df69fb4df4 100644 --- a/Tethering/res/values-is/strings.xml +++ b/Tethering/res/values-is/strings.xml @@ -16,14 +16,14 @@ - "Kveikt á tjóðrun eða aðgangsstað" - "Ýttu til að setja upp." - "Slökkt er á tjóðrun" - "Hafðu samband við kerfisstjórann til að fá upplýsingar" - "Staða heits reits og tjóðrunar" - - - - - + "Kveikt á tjóðrun eða heitum reit" + "Ýttu til að setja upp." + "Slökkt er á tjóðrun" + "Hafðu samband við stjórnanda til að fá upplýsingar" + "Staða heits reits og tjóðrunar" + + + + + diff --git a/Tethering/res/values-it/strings.xml b/Tethering/res/values-it/strings.xml index ffb9196f5e..b13ee9262c 100644 --- a/Tethering/res/values-it/strings.xml +++ b/Tethering/res/values-it/strings.xml @@ -16,14 +16,14 @@ - "Hotspot o tethering attivo" - "Tocca per impostare." - "Tethering disattivato" - "Contatta il tuo amministratore per avere informazioni dettagliate" - "Stato hotspot e tethering" - - - - - + "Hotspot o tethering attivo" + "Tocca per impostare." + "Tethering disattivato" + "Contatta il tuo amministratore per avere informazioni dettagliate" + "Stato hotspot e tethering" + + + + + diff --git a/Tethering/res/values-iw/strings.xml b/Tethering/res/values-iw/strings.xml index 7adcb47350..f7fb4d51ce 100644 --- a/Tethering/res/values-iw/strings.xml +++ b/Tethering/res/values-iw/strings.xml @@ -16,14 +16,14 @@ - "נקודה לשיתוף אינטרנט או שיתוף אינטרנט בין מכשירים: בסטטוס פעיל" - "יש להקיש כדי להגדיר." - "שיתוף האינטרנט בין מכשירים מושבת" - "לפרטים, יש לפנות למנהל המערכת" - "סטטוס של נקודה לשיתוף אינטרנט ושיתוף אינטרנט בין מכשירים" - - - - - + "שיתוף האינטרנט או הנקודה לשיתוף אינטרנט פעילים" + "יש להקיש כדי להגדיר." + "שיתוף האינטרנט בין מכשירים מושבת" + "לפרטים, יש לפנות לאדמין" + "סטטוס של נקודה לשיתוף אינטרנט ושיתוף אינטרנט בין מכשירים" + + + + + diff --git a/Tethering/res/values-ja/strings.xml b/Tethering/res/values-ja/strings.xml index f68a73010b..172e7716bf 100644 --- a/Tethering/res/values-ja/strings.xml +++ b/Tethering/res/values-ja/strings.xml @@ -16,14 +16,14 @@ - "テザリングまたはアクセス ポイントが有効です" - "タップしてセットアップします。" - "テザリングは無効に設定されています" - "詳しくは、管理者にお問い合わせください" - "アクセス ポイントとテザリングのステータス" - - - - - + "テザリングまたはアクセス ポイントが有効です" + "タップしてセットアップしてください。" + "テザリングは無効に設定されています" + "詳しくは、管理者にお問い合わせください" + "アクセス ポイントとテザリングのステータス" + + + + + diff --git a/Tethering/res/values-ka/strings.xml b/Tethering/res/values-ka/strings.xml index 7c22e82bd3..b4e119177d 100644 --- a/Tethering/res/values-ka/strings.xml +++ b/Tethering/res/values-ka/strings.xml @@ -16,14 +16,14 @@ - "ტეტერინგი ან უსადენო ქსელი აქტიურია" - "შეეხეთ დასაყენებლად." - "ტეტერინგი გათიშულია" - "დამატებითი ინფორმაციისთვის დაუკავშირდით თქვენს ადმინისტრატორს" - "უსადენო ქსელის და ტეტერინგის სტატუსი" - - - - - + "ტეტერინგი ან უსადენო ქსელი აქტიურია" + "შეეხეთ დასაყენებლად." + "ტეტერინგი გათიშულია" + "დამატებითი ინფორმაციისთვის დაუკავშირდით თქვენს ადმინისტრატორს" + "უსადენო ქსელის და ტეტერინგის სტატუსი" + + + + + diff --git a/Tethering/res/values-kk/strings.xml b/Tethering/res/values-kk/strings.xml index 0857d06de2..01163811ab 100644 --- a/Tethering/res/values-kk/strings.xml +++ b/Tethering/res/values-kk/strings.xml @@ -16,14 +16,14 @@ - "Тетеринг немесе хотспот қосулы" - "Реттеу үшін түртіңіз." - "Тетеринг өшірілді." - "Мәліметтерді әкімшіден алыңыз." - "Хотспот және тетеринг күйі" - - - - - + "Тетеринг немесе хотспот іске қосылған" + "Реттеу үшін түртіңіз." + "Тетеринг өшірілді." + "Мәлімет алу үшін әкімшіге хабарласыңыз." + "Хотспот және тетеринг күйі" + + + + + diff --git a/Tethering/res/values-km/strings.xml b/Tethering/res/values-km/strings.xml index 536e3d1703..52667e8260 100644 --- a/Tethering/res/values-km/strings.xml +++ b/Tethering/res/values-km/strings.xml @@ -16,14 +16,14 @@ - "ការភ្ជាប់ ឬហតស្ប៉ត​កំពុងដំណើរការ" - "ចុច​ដើម្បី​រៀបចំ។" - "ការភ្ជាប់​ត្រូវបានបិទ" - "ទាក់ទងអ្នកគ្រប់គ្រង​របស់អ្នក ដើម្បីទទួលបានព័ត៌មានលម្អិត" - "ស្ថានភាពនៃការភ្ជាប់ និងហតស្ប៉ត" - - - - - + "ការភ្ជាប់ ឬហតស្ប៉ត​កំពុងដំណើរការ" + "ចុច​ដើម្បី​រៀបចំ។" + "ការភ្ជាប់​ត្រូវបានបិទ" + "ទាក់ទងអ្នកគ្រប់គ្រង​របស់អ្នក ដើម្បីទទួលបានព័ត៌មានលម្អិត" + "ស្ថានភាពនៃការភ្ជាប់ និងហតស្ប៉ត" + + + + + diff --git a/Tethering/res/values-kn/strings.xml b/Tethering/res/values-kn/strings.xml index 32f54926f4..a0a3607f1a 100644 --- a/Tethering/res/values-kn/strings.xml +++ b/Tethering/res/values-kn/strings.xml @@ -16,14 +16,14 @@ - "ಟೆಥರಿಂಗ್ ಅಥವಾ ಹಾಟ್‌ಸ್ಪಾಟ್ ಸಕ್ರಿಯವಾಗಿದೆ" - "ಸೆಟಪ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ." - "ಟೆಥರಿಂಗ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ" - "ವಿವರಗಳಿಗಾಗಿ ನಿಮ್ಮ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ" - "ಹಾಟ್‌ಸ್ಪಾಟ್ ಮತ್ತು ಟೆಥರಿಂಗ್‌ ಸ್ಥಿತಿ" - - - - - + "ಟೆಥರಿಂಗ್ ಅಥವಾ ಹಾಟ್‌ಸ್ಪಾಟ್ ಸಕ್ರಿಯವಾಗಿದೆ" + "ಸೆಟಪ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ." + "ಟೆಥರಿಂಗ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ" + "ವಿವರಗಳಿಗಾಗಿ ನಿಮ್ಮ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ" + "ಹಾಟ್‌ಸ್ಪಾಟ್ ಮತ್ತು ಟೆಥರಿಂಗ್‌ ಸ್ಥಿತಿ" + + + + + diff --git a/Tethering/res/values-ko/strings.xml b/Tethering/res/values-ko/strings.xml index 156b24786d..f7b8da06b7 100644 --- a/Tethering/res/values-ko/strings.xml +++ b/Tethering/res/values-ko/strings.xml @@ -16,14 +16,14 @@ - "테더링 또는 핫스팟 사용" - "설정하려면 탭하세요." - "테더링이 사용 중지됨" - "자세한 정보는 관리자에게 문의하세요." - "핫스팟 및 테더링 상태" - - - - - + "테더링 또는 핫스팟 사용 중" + "설정하려면 탭하세요." + "테더링이 사용 중지됨" + "자세한 정보는 관리자에게 문의하세요." + "핫스팟 및 테더링 상태" + + + + + diff --git a/Tethering/res/values-ky/strings.xml b/Tethering/res/values-ky/strings.xml index 18ee5fd357..4696a72552 100644 --- a/Tethering/res/values-ky/strings.xml +++ b/Tethering/res/values-ky/strings.xml @@ -16,14 +16,14 @@ - "Модем режими күйүп турат" - "Жөндөө үчүн таптап коюңуз." - "Телефонду модем катары колдонууга болбойт" - "Кеңири маалымат үчүн администраторуңузга кайрылыңыз" - "Байланыш түйүнүнүн жана модем режиминин статусу" - - - - - + "Модем режими күйүп турат" + "Тууралоо үчүн басыңыз." + "Модем режими өчүк" + "Кеңири маалымат үчүн администраторуңузга кайрылыңыз" + "Байланыш түйүнү жана байланыш түйүнүүн статусу" + + + + + diff --git a/Tethering/res/values-lo/strings.xml b/Tethering/res/values-lo/strings.xml index b12767018c..046551d1a7 100644 --- a/Tethering/res/values-lo/strings.xml +++ b/Tethering/res/values-lo/strings.xml @@ -16,14 +16,14 @@ - "ເປີດການປ່ອຍສັນຍານ ຫຼື ຮັອດສະປອດແລ້ວ" - "ແຕະເພື່ອຕັ້ງຄ່າ." - "ການປ່ອຍສັນຍານຖືກປິດໄວ້" - "ຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບສຳລັບລາຍລະອຽດ" - "ສະຖານະຮັອດສະປອດ ແລະ ການປ່ອຍສັນຍານ" - - - - - + "ການປ່ອຍສັນຍານ ຫຼື ຮັອດສະປອດເປີດນຳໃຊ້ຢູ່" + "ແຕະເພື່ອຕັ້ງຄ່າ." + "ການປ່ອຍສັນຍານຖືກປິດໄວ້" + "ຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານສຳລັບລາຍລະອຽດ" + "ສະຖານະຮັອດສະປອດ ແລະ ການປ່ອຍສັນຍານ" + + + + + diff --git a/Tethering/res/values-lt/strings.xml b/Tethering/res/values-lt/strings.xml index 8427baf39f..c6853182ff 100644 --- a/Tethering/res/values-lt/strings.xml +++ b/Tethering/res/values-lt/strings.xml @@ -16,14 +16,14 @@ - "Įrenginys naudojamas kaip modemas arba įjungtas viešosios interneto prieigos taškas" - "Palieskite, kad nustatytumėte." - "Įrenginio kaip modemo naudojimas išjungtas" - "Jei reikia išsamios informacijos, susisiekite su administratoriumi" - "Viešosios interneto prieigos taško ir įrenginio kaip modemo naudojimo būsena" - - - - - + "Įrenginys naudojamas kaip modemas arba įjungtas viešosios interneto prieigos taškas" + "Palieskite, kad nustatytumėte." + "Įrenginio kaip modemo naudojimas išjungtas" + "Jei reikia išsamios informacijos, susisiekite su administratoriumi" + "Viešosios interneto prieigos taško ir įrenginio kaip modemo naudojimo būsena" + + + + + diff --git a/Tethering/res/values-lv/strings.xml b/Tethering/res/values-lv/strings.xml index aa2d6990e0..fd8751c191 100644 --- a/Tethering/res/values-lv/strings.xml +++ b/Tethering/res/values-lv/strings.xml @@ -16,14 +16,14 @@ - "Piesaiste vai tīklājs ir aktīvs." - "Pieskarieties, lai to iestatītu." - "Piesaiste ir atspējota" - "Lai iegūtu detalizētu informāciju, sazinieties ar savu administratoru." - "Tīklāja un piesaistes statuss" - - - - - + "Piesaiste vai tīklājs ir aktīvs" + "Pieskarieties, lai iestatītu." + "Piesaiste ir atspējota" + "Lai iegūtu detalizētu informāciju, sazinieties ar savu administratoru." + "Tīklāja un piesaistes statuss" + + + + + diff --git a/Tethering/res/values-mcc310-mnc004-af/strings.xml b/Tethering/res/values-mcc310-mnc004-af/strings.xml index 19d659c6ce..216c02ccce 100644 --- a/Tethering/res/values-mcc310-mnc004-af/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-af/strings.xml @@ -16,9 +16,9 @@ - "Verbinding het nie internet nie" - "Toestelle kan nie koppel nie" - "Skakel verbinding af" - "Warmkol of verbinding is aan" - "Bykomende heffings kan geld terwyl jy swerf" + "Verbinding het nie internet nie" + "Toestelle kan nie koppel nie" + "Skakel verbinding af" + "Warmkol of verbinding is aan" + "Bykomende heffings kan geld terwyl jy swerf" diff --git a/Tethering/res/values-mcc310-mnc004-am/strings.xml b/Tethering/res/values-mcc310-mnc004-am/strings.xml index 8995430b4f..666630ab99 100644 --- a/Tethering/res/values-mcc310-mnc004-am/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-am/strings.xml @@ -16,9 +16,9 @@ - "ማስተሳሰር ምንም በይነመረብ የለውም" - "መሣሪያዎችን ማገናኘት አይቻልም" - "ማስተሳሰርን አጥፋ" - "መገናኛ ነጥብ ወይም ማስተሳሰር በርቷል" - "በሚያንዣብብበት ጊዜ ተጨማሪ ክፍያዎች ተፈጻሚ ሊሆኑ ይችላሉ" + "እንደ ሞደም መሰካት ምንም በይነመረብ የለውም" + "መሣሪያዎችን ማገናኘት አልተቻልም" + "እንደ ሞደም መሰካትን አጥፋ" + "መገናኛ ነጥብ ወይም እንደ ሞደም መሰካት በርቷል" + "በሚያንዣብብበት ጊዜ ተጨማሪ ክፍያዎች ተፈጻሚ ሊሆኑ ይችላሉ" diff --git a/Tethering/res/values-mcc310-mnc004-ar/strings.xml b/Tethering/res/values-mcc310-mnc004-ar/strings.xml index 54f3b5389a..2859803ed9 100644 --- a/Tethering/res/values-mcc310-mnc004-ar/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-ar/strings.xml @@ -16,9 +16,9 @@ - "ما مِن اتصال بالإنترنت خلال التوصيل" - "تعذّر اتصال الأجهزة" - "إيقاف التوصيل" - "نقطة الاتصال أو التوصيل مفعّلان" - "قد يتم تطبيق رسوم إضافية أثناء التجوال." + "ما مِن اتصال بالإنترنت خلال التوصيل" + "يتعذّر اتصال الأجهزة" + "إيقاف التوصيل" + "نقطة الاتصال مفعَّلة أو التوصيل مفعَّل" + "قد يتم تحصيل رسوم إضافية أثناء التجوال." diff --git a/Tethering/res/values-mcc310-mnc004-as/strings.xml b/Tethering/res/values-mcc310-mnc004-as/strings.xml index e215141c9e..360c8caf42 100644 --- a/Tethering/res/values-mcc310-mnc004-as/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-as/strings.xml @@ -16,9 +16,9 @@ - "টে\'ডাৰিঙৰ ইণ্টাৰনেট নাই" - "ডিভাইচসমূহ সংযোগ কৰিব নোৱাৰি" - "টে\'ডাৰিং অফ কৰক" - "হটস্পট অথবা টে\'ডাৰিং অন আছে" - "ৰ\'মিঙত থাকিলে অতিৰিক্ত মাচুল প্ৰযোজ্য হ’ব পাৰে" + "টে’ডাৰিঙৰ ইণ্টাৰনেট নাই" + "ডিভাইচসমূহ সংযোগ কৰিব নোৱাৰি" + "টে’ডাৰিং অফ কৰক" + "হ’টস্প’ট অথবা টে’ডাৰিং অন আছে" + "ৰ’মিঙত থাকিলে অতিৰিক্ত মাচুল প্ৰযোজ্য হ’ব পাৰে" diff --git a/Tethering/res/values-mcc310-mnc004-az/strings.xml b/Tethering/res/values-mcc310-mnc004-az/strings.xml index 1fd8e4c963..b7fdd70fcc 100644 --- a/Tethering/res/values-mcc310-mnc004-az/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-az/strings.xml @@ -16,9 +16,9 @@ - "Modemin internetə girişi yoxdur" - "Cihazları qoşmaq mümkün deyil" - "Modemi deaktiv edin" - "Hotspot və ya modem aktivdir" - "Rouminq zamanı əlavə ödənişlər tətbiq edilə bilər" + "Modem rejimi internetə qoşulmayıb" + "Cihazları qoşmaq olmur" + "Modem rejimini deaktiv edin" + "Hotspot və ya modem rejimi aktivdir" + "Rouminq zamanı əlavə ödəniş çıxıla bilər" diff --git a/Tethering/res/values-mcc310-mnc004-b+sr+Latn/strings.xml b/Tethering/res/values-mcc310-mnc004-b+sr+Latn/strings.xml index 1abe4f3aa3..a214f938c3 100644 --- a/Tethering/res/values-mcc310-mnc004-b+sr+Latn/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-b+sr+Latn/strings.xml @@ -16,9 +16,9 @@ - "Privezivanje nema pristup internetu" - "Povezivanje uređaja nije uspelo" - "Isključi privezivanje" - "Uključen je hotspot ili privezivanje" - "Možda važe dodatni troškovi u romingu" + "Privezivanje nema pristup internetu" + "Povezivanje uređaja nije uspelo" + "Isključi privezivanje" + "Uključen je hotspot ili privezivanje" + "Možda važe dodatni troškovi u romingu" diff --git a/Tethering/res/values-mcc310-mnc004-be/strings.xml b/Tethering/res/values-mcc310-mnc004-be/strings.xml index 38dbd1e391..316e856205 100644 --- a/Tethering/res/values-mcc310-mnc004-be/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-be/strings.xml @@ -16,9 +16,9 @@ - "Рэжым мадэма выкарыстоўваецца без доступу да інтэрнэту" - "Не ўдалося падключыць прылады" - "Выключыць рэжым мадэма" - "Хот-спот або рэжым мадэма ўключаны" - "Пры выкарыстанні роўмінгу можа спаганяцца дадатковая плата" + "Рэжым мадэма выкарыстоўваецца без доступу да інтэрнэту" + "Не ўдалося падключыць прылады" + "Выключыць рэжым мадэма" + "Хот-спот або рэжым мадэма ўключаны" + "Пры выкарыстанні роўмінгу можа спаганяцца дадатковая плата" diff --git a/Tethering/res/values-mcc310-mnc004-bg/strings.xml b/Tethering/res/values-mcc310-mnc004-bg/strings.xml index 04b44db5c1..a31c06a6ce 100644 --- a/Tethering/res/values-mcc310-mnc004-bg/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-bg/strings.xml @@ -16,9 +16,9 @@ - "Тетърингът няма връзка с интернет" - "Устройствата не могат да установят връзка" - "Изключване на тетъринга" - "Точката за достъп или тетърингът са включени" - "Възможно е да ви бъдат начислени допълнителни такси при роуминг" + "Няма връзка с интернет за тетъринг" + "Устройствата не могат да установят връзка" + "Изключване на функцията за тетъринг" + "Точката за достъп или функцията за тетъринг са включени" + "Възможно е да ви бъдат начислени допълнителни такси при роуминг" diff --git a/Tethering/res/values-mcc310-mnc004-bn/strings.xml b/Tethering/res/values-mcc310-mnc004-bn/strings.xml index 579d1be1c1..f49b14c41c 100644 --- a/Tethering/res/values-mcc310-mnc004-bn/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-bn/strings.xml @@ -16,9 +16,9 @@ - "টিথারিং করার জন্য কোনও ইন্টারনেট কানেকশন নেই" - "ডিভাইস কানেক্ট করতে পারছে না" - "টিথারিং বন্ধ করুন" - "হটস্পট বা টিথারিং চালু আছে" - "রোমিংয়ের সময় অতিরিক্ত চার্জ করা হতে পারে" + "টেথারিং করার জন্য কোনও ইন্টারনেট কানেকশন লাগে না" + "ডিভাইস কানেক্ট করা যাচ্ছে না" + "টেথারিং বন্ধ করুন" + "হটস্পট বা টেথারিং চালু আছে" + "রোমিংয়ে থাকার সময় অতিরিক্ত চার্জ লাগতে পারে" diff --git a/Tethering/res/values-mcc310-mnc004-bs/strings.xml b/Tethering/res/values-mcc310-mnc004-bs/strings.xml index 9ce3efe6c3..ed269c6982 100644 --- a/Tethering/res/values-mcc310-mnc004-bs/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-bs/strings.xml @@ -16,9 +16,9 @@ - "Povezivanje putem mobitela nema internet" - "Uređaji se ne mogu povezati" - "Isključi povezivanje putem mobitela" - "Pristupna tačka ili povezivanje putem mobitela je uključeno" - "Mogu nastati dodatni troškovi u romingu" + "Dijeljenje internetske veze nema internet" + "Nije moguće povezati uređaje" + "Isključi dijeljenje internetske veze" + "Pristupna tačka ili dijeljenje internetske veze su uključeni" + "Mogu nastati dodatni troškovi u romingu" diff --git a/Tethering/res/values-mcc310-mnc004-ca/strings.xml b/Tethering/res/values-mcc310-mnc004-ca/strings.xml index 46d4c35b9b..0826f4ee35 100644 --- a/Tethering/res/values-mcc310-mnc004-ca/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-ca/strings.xml @@ -16,9 +16,9 @@ - "La compartició de xarxa no té accés a Internet" - "No es poden connectar els dispositius" - "Desactiva la compartició de xarxa" - "S\'ha activat el punt d\'accés Wi‑Fi o la compartició de xarxa" - "És possible que s\'apliquin costos addicionals en itinerància" + "La compartició de xarxa no té accés a Internet" + "No es poden connectar els dispositius" + "Desactiva la compartició de xarxa" + "El punt d\'accés Wi‑Fi o la compartició de xarxa estan activats" + "És possible que s\'apliquin costos addicionals en itinerància" diff --git a/Tethering/res/values-mcc310-mnc004-cs/strings.xml b/Tethering/res/values-mcc310-mnc004-cs/strings.xml index cc13860b3d..6899f711b6 100644 --- a/Tethering/res/values-mcc310-mnc004-cs/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-cs/strings.xml @@ -16,9 +16,9 @@ - "Tethering nemá připojení k internetu" - "Zařízení se nemůžou připojit" - "Vypnout tethering" - "Je zapnutý hotspot nebo tethering" - "Při roamingu mohou být účtovány dodatečné poplatky" + "Tethering nemá připojení k internetu" + "Zařízení se nemůžou připojit" + "Vypnout tethering" + "Je zapnutý hotspot nebo tethering" + "Při roamingu mohou být účtovány dodatečné poplatky" diff --git a/Tethering/res/values-mcc310-mnc004-da/strings.xml b/Tethering/res/values-mcc310-mnc004-da/strings.xml index 92c3ae1156..dbca93b5cb 100644 --- a/Tethering/res/values-mcc310-mnc004-da/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-da/strings.xml @@ -16,9 +16,9 @@ - "Netdeling har ingen internetforbindelse" - "Enheder kan ikke oprette forbindelse" - "Deaktiver netdeling" - "Hotspot eller netdeling er aktiveret" - "Der opkræves muligvis yderligere gebyrer ved roaming" + "Netdeling har ingen internetforbindelse" + "Enheder kan ikke oprette forbindelse" + "Deaktiver netdeling" + "Hotspot eller netdeling er aktiveret" + "Der opkræves muligvis yderligere gebyrer ved roaming" diff --git a/Tethering/res/values-mcc310-mnc004-de/strings.xml b/Tethering/res/values-mcc310-mnc004-de/strings.xml index 967eb4db2e..139b4e0b0c 100644 --- a/Tethering/res/values-mcc310-mnc004-de/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-de/strings.xml @@ -16,9 +16,9 @@ - "Tethering hat keinen Internetzugriff" - "Geräte können sich nicht verbinden" - "Tethering deaktivieren" - "Hotspot oder Tethering ist aktiviert" - "Für das Roaming können zusätzliche Gebühren anfallen" + "Tethering hat keinen Internetzugriff" + "Geräte können sich nicht verbinden" + "Tethering deaktivieren" + "Hotspot oder Tethering ist aktiviert" + "Für das Roaming können zusätzliche Gebühren anfallen" diff --git a/Tethering/res/values-mcc310-mnc004-el/strings.xml b/Tethering/res/values-mcc310-mnc004-el/strings.xml index 5fb497451f..d778b03aa7 100644 --- a/Tethering/res/values-mcc310-mnc004-el/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-el/strings.xml @@ -16,9 +16,9 @@ - "Η σύνδεση δεν έχει πρόσβαση στο διαδίκτυο" - "Δεν είναι δυνατή η σύνδεση των συσκευών" - "Απενεργοποιήστε τη σύνδεση" - "Ενεργό σημείο πρόσβασης Wi-Fi ή ενεργή σύνδεση" - "Ενδέχεται να ισχύουν επιπλέον χρεώσεις κατά την περιαγωγή." + "Η σύνδεση δεν έχει πρόσβαση στο διαδίκτυο" + "Δεν είναι δυνατή η σύνδεση των συσκευών" + "Απενεργοποίηση σύνδεσης" + "Ενεργό σημείο πρόσβασης Wi-Fi ή ενεργή σύνδεση" + "Ενδέχεται να ισχύουν επιπλέον χρεώσεις κατά την περιαγωγή." diff --git a/Tethering/res/values-mcc310-mnc004-en-rAU/strings.xml b/Tethering/res/values-mcc310-mnc004-en-rAU/strings.xml index 45647f93f2..bc68d0088e 100644 --- a/Tethering/res/values-mcc310-mnc004-en-rAU/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-en-rAU/strings.xml @@ -16,9 +16,9 @@ - "Tethering has no Internet" - "Devices can’t connect" - "Turn off tethering" - "Hotspot or tethering is on" - "Additional charges may apply while roaming" + "Tethering has no Internet" + "Devices can\'t connect" + "Turn off tethering" + "Hotspot or tethering is on" + "Additional charges may apply while roaming" diff --git a/Tethering/res/values-mcc310-mnc004-en-rCA/strings.xml b/Tethering/res/values-mcc310-mnc004-en-rCA/strings.xml index 45647f93f2..4f39489aaa 100644 --- a/Tethering/res/values-mcc310-mnc004-en-rCA/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-en-rCA/strings.xml @@ -16,9 +16,9 @@ - "Tethering has no Internet" - "Devices can’t connect" - "Turn off tethering" - "Hotspot or tethering is on" - "Additional charges may apply while roaming" + "Tethering has no internet" + "Devices can’t connect" + "Turn off tethering" + "Hotspot or tethering is on" + "Additional charges may apply while roaming" diff --git a/Tethering/res/values-mcc310-mnc004-en-rGB/strings.xml b/Tethering/res/values-mcc310-mnc004-en-rGB/strings.xml index 45647f93f2..bc68d0088e 100644 --- a/Tethering/res/values-mcc310-mnc004-en-rGB/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-en-rGB/strings.xml @@ -16,9 +16,9 @@ - "Tethering has no Internet" - "Devices can’t connect" - "Turn off tethering" - "Hotspot or tethering is on" - "Additional charges may apply while roaming" + "Tethering has no Internet" + "Devices can\'t connect" + "Turn off tethering" + "Hotspot or tethering is on" + "Additional charges may apply while roaming" diff --git a/Tethering/res/values-mcc310-mnc004-en-rIN/strings.xml b/Tethering/res/values-mcc310-mnc004-en-rIN/strings.xml index 45647f93f2..bc68d0088e 100644 --- a/Tethering/res/values-mcc310-mnc004-en-rIN/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-en-rIN/strings.xml @@ -16,9 +16,9 @@ - "Tethering has no Internet" - "Devices can’t connect" - "Turn off tethering" - "Hotspot or tethering is on" - "Additional charges may apply while roaming" + "Tethering has no Internet" + "Devices can\'t connect" + "Turn off tethering" + "Hotspot or tethering is on" + "Additional charges may apply while roaming" diff --git a/Tethering/res/values-mcc310-mnc004-en-rXC/strings.xml b/Tethering/res/values-mcc310-mnc004-en-rXC/strings.xml index 7877074afc..be00edfb06 100644 --- a/Tethering/res/values-mcc310-mnc004-en-rXC/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-en-rXC/strings.xml @@ -16,9 +16,9 @@ - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎Tethering has no internet‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎Devices can’t connect‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎Turn off tethering‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‏‎Hotspot or tethering is on‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎Additional charges may apply while roaming‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‏‎‎Tethering has no internet‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‎Devices can’t connect‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎Turn off tethering‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎Hotspot or tethering is on‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‎Additional charges may apply while roaming‎‏‎‎‏‎" diff --git a/Tethering/res/values-mcc310-mnc004-es-rUS/strings.xml b/Tethering/res/values-mcc310-mnc004-es-rUS/strings.xml index 08edd81a6b..e00a7a0b90 100644 --- a/Tethering/res/values-mcc310-mnc004-es-rUS/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-es-rUS/strings.xml @@ -16,9 +16,9 @@ - "La conexión mediante dispositivo móvil no tiene Internet" - "No se pueden conectar los dispositivos" - "Desactivar conexión mediante dispositivo móvil" - "Se activó el hotspot o la conexión mediante dispositivo móvil" - "Es posible que se apliquen cargos adicionales por roaming" + "La conexión mediante dispositivo móvil no tiene Internet" + "No se pueden conectar los dispositivos" + "Desactivar conexión mediante dispositivo móvil" + "Se activó el hotspot o la conexión mediante dispositivo móvil" + "Es posible que se apliquen cargos adicionales por roaming" diff --git a/Tethering/res/values-mcc310-mnc004-es/strings.xml b/Tethering/res/values-mcc310-mnc004-es/strings.xml index 79f51d00e2..6c7e9838ae 100644 --- a/Tethering/res/values-mcc310-mnc004-es/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-es/strings.xml @@ -16,9 +16,9 @@ - "La conexión no se puede compartir, porque no hay acceso a Internet" - "Los dispositivos no se pueden conectar" - "Desactivar conexión compartida" - "Punto de acceso o conexión compartida activados" - "Puede que se apliquen cargos adicionales en itinerancia" + "La conexión no se puede compartir, porque no hay acceso a Internet" + "Los dispositivos no se pueden conectar" + "Desactivar conexión compartida" + "Punto de acceso o conexión compartida activados" + "Pueden aplicarse cargos adicionales en roaming" diff --git a/Tethering/res/values-mcc310-mnc004-et/strings.xml b/Tethering/res/values-mcc310-mnc004-et/strings.xml index 2da5f8a6d6..2f108fc3d9 100644 --- a/Tethering/res/values-mcc310-mnc004-et/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-et/strings.xml @@ -16,9 +16,9 @@ - "Jagamisel puudub internetiühendus" - "Seadmed ei saa ühendust luua" - "Lülita jagamine välja" - "Kuumkoht või jagamine on sisse lülitatud" - "Rändluse kasutamisega võivad kaasneda lisatasud" + "Jagamisel puudub internetiühendus" + "Seadmed ei saa ühendust luua" + "Lülita jagamine välja" + "Kuumkoht või jagamine on sisse lülitatud" + "Rändluse kasutamisega võivad kaasneda lisatasud" diff --git a/Tethering/res/values-mcc310-mnc004-eu/strings.xml b/Tethering/res/values-mcc310-mnc004-eu/strings.xml index 2073f2806c..c970dd753f 100644 --- a/Tethering/res/values-mcc310-mnc004-eu/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-eu/strings.xml @@ -16,9 +16,9 @@ - "Konexioa partekatzeko aukerak ez du Interneteko konexiorik" - "Ezin dira konektatu gailuak" - "Desaktibatu konexioa partekatzeko aukera" - "Wifi-gunea edo konexioa partekatzeko aukera aktibatuta dago" - "Baliteke kostu gehigarriak ordaindu behar izatea ibiltaritzan" + "Konexioa partekatzeko aukerak ez du Interneteko konexiorik" + "Ezin dira konektatu gailuak" + "Desaktibatu konexioa partekatzeko aukera" + "Wifi-gunea edo konexioa partekatzeko aukera aktibatuta dago" + "Baliteke tarifa gehigarriak ordaindu behar izatea ibiltaritza erabili bitartean" diff --git a/Tethering/res/values-mcc310-mnc004-fa/strings.xml b/Tethering/res/values-mcc310-mnc004-fa/strings.xml index e21b2a0852..7333e2fc58 100644 --- a/Tethering/res/values-mcc310-mnc004-fa/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-fa/strings.xml @@ -16,9 +16,9 @@ - "«اشتراک‌گذاری اینترنت» به اینترنت دسترسی ندارد" - "دستگاه‌ها متصل نمی‌شوند" - "خاموش کردن «اشتراک‌گذاری اینترنت»" - "«نقطه اتصال» یا «اشتراک‌گذاری اینترنت» روشن است" - "ممکن است درحین فراگردی تغییرات دیگر اعمال شود" + "«اشتراک‌گذاری اینترنت» به اینترنت دسترسی ندارد" + "دستگاه‌ها متصل نمی‌شوند" + "خاموش کردن «اشتراک‌گذاری اینترنت»" + "«نقطه اتصال» یا «اشتراک‌گذاری اینترنت» روشن است" + "هنگام فراگردی ممکن است هزینه‌های اضافی کسر شود" diff --git a/Tethering/res/values-mcc310-mnc004-fi/strings.xml b/Tethering/res/values-mcc310-mnc004-fi/strings.xml index 88b0b13eb4..3faed5b1bd 100644 --- a/Tethering/res/values-mcc310-mnc004-fi/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-fi/strings.xml @@ -16,9 +16,9 @@ - "Ei jaettavaa internetyhteyttä" - "Laitteet eivät voi muodostaa yhteyttä" - "Laita yhteyden jakaminen pois päältä" - "Hotspot tai yhteyden jakaminen on päällä" - "Roaming voi aiheuttaa lisämaksuja" + "Puhelinta ei voi käyttää modeemina, koska sillä ei ole internet-yhteyttä" + "Laitteet eivät voi muodostaa yhteyttä" + "Laita puhelimen käyttäminen modeemina pois päältä" + "Hotspot tai puhelimen käyttäminen modeemina on päällä" + "Roaming voi aiheuttaa lisämaksuja" diff --git a/Tethering/res/values-mcc310-mnc004-fr-rCA/strings.xml b/Tethering/res/values-mcc310-mnc004-fr-rCA/strings.xml index 3b781bc8db..0659c40315 100644 --- a/Tethering/res/values-mcc310-mnc004-fr-rCA/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-fr-rCA/strings.xml @@ -16,9 +16,9 @@ - "Le partage de connexion n\'est pas connecté à Internet" - "Impossible de connecter les appareils" - "Désactiver le partage de connexion" - "Le point d\'accès ou le partage de connexion est activé" - "En itinérance, des frais supplémentaires peuvent s\'appliquer" + "Le partage de connexion n\'est pas connecté à Internet" + "Impossible de connecter les appareils" + "Désactiver le partage de connexion" + "Le point d\'accès sans fil ou le partage de connexion est activé" + "En itinérance, des frais supplémentaires peuvent s\'appliquer" diff --git a/Tethering/res/values-mcc310-mnc004-fr/strings.xml b/Tethering/res/values-mcc310-mnc004-fr/strings.xml index 51d7203c36..26065f8cf6 100644 --- a/Tethering/res/values-mcc310-mnc004-fr/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-fr/strings.xml @@ -16,9 +16,9 @@ - "Aucune connexion à Internet n\'est disponible pour le partage de connexion" - "Impossible de connecter les appareils" - "Désactiver le partage de connexion" - "Le point d\'accès ou le partage de connexion est activé" - "En itinérance, des frais supplémentaires peuvent s\'appliquer" + "Aucune connexion à Internet disponible pour le partage de connexion" + "Impossible de connecter les appareils" + "Désactiver le partage de connexion" + "Le point d\'accès ou le partage de connexion est activé" + "En itinérance, des frais supplémentaires peuvent s\'appliquer" diff --git a/Tethering/res/values-mcc310-mnc004-gl/strings.xml b/Tethering/res/values-mcc310-mnc004-gl/strings.xml index 008ccb475d..924e71bedd 100644 --- a/Tethering/res/values-mcc310-mnc004-gl/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-gl/strings.xml @@ -16,9 +16,9 @@ - "A conexión compartida non ten Internet" - "Non se puideron conectar os dispositivos" - "Desactivar conexión compartida" - "Está activada a zona wifi ou a conexión compartida" - "Pódense aplicar cargos adicionais en itinerancia" + "A conexión compartida non ten acceso a Internet" + "Non se puideron conectar os dispositivos" + "Desactivar conexión compartida" + "Está activada a zona wifi ou a conexión compartida" + "Pódense aplicar cargos adicionais en itinerancia" diff --git a/Tethering/res/values-mcc310-mnc004-gu/strings.xml b/Tethering/res/values-mcc310-mnc004-gu/strings.xml index f2e3b4df78..ab446df024 100644 --- a/Tethering/res/values-mcc310-mnc004-gu/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-gu/strings.xml @@ -16,9 +16,9 @@ - "ઇન્ટરનેટ શેર કરવાની સુવિધામાં ઇન્ટરનેટ નથી" - "ડિવાઇસ કનેક્ટ કરી શકાતા નથી" - "ઇન્ટરનેટ શેર કરવાની સુવિધા બંધ કરો" - "હૉટસ્પૉટ અથવા ઇન્ટરનેટ શેર કરવાની સુવિધા ચાલુ છે" - "રોમિંગમાં વધારાના શુલ્ક લાગી શકે છે" + "ઇન્ટરનેટ શેર કરવાની સુવિધામાં ઇન્ટરનેટ નથી" + "ડિવાઇસ કનેક્ટ કરી શકાતા નથી" + "ઇન્ટરનેટ શેર કરવાની સુવિધા બંધ કરો" + "હૉટસ્પૉટ અથવા ઇન્ટરનેટ શેર કરવાની સુવિધા ચાલુ છે" + "રોમિંગ દરમિયાન વધારાના શુલ્ક લાગુ થઈ શકે છે" diff --git a/Tethering/res/values-mcc310-mnc004-hi/strings.xml b/Tethering/res/values-mcc310-mnc004-hi/strings.xml index b11839d760..073a680bf3 100644 --- a/Tethering/res/values-mcc310-mnc004-hi/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-hi/strings.xml @@ -16,9 +16,9 @@ - "टेदरिंग से इंटरनेट नहीं चल रहा" - "डिवाइस कनेक्ट नहीं हो पा रहे" - "टेदरिंग बंद करें" - "हॉटस्पॉट या टेदरिंग चालू है" - "रोमिंग के दौरान अतिरिक्त शुल्क लग सकता है" + "टेदरिंग से इंटरनेट नहीं चल रहा है" + "डिवाइस कनेक्ट नहीं हो पा रहे" + "टेदरिंग बंद करें" + "हॉटस्पॉट या टेदरिंग चालू है" + "रोमिंग के दौरान अतिरिक्त शुल्क काटा जा सकता है" diff --git a/Tethering/res/values-mcc310-mnc004-hr/strings.xml b/Tethering/res/values-mcc310-mnc004-hr/strings.xml index 0a5aca25b1..6cc841538e 100644 --- a/Tethering/res/values-mcc310-mnc004-hr/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-hr/strings.xml @@ -16,9 +16,9 @@ - "Modemsko povezivanje nema internet" - "Uređaji se ne mogu povezati" - "Isključivanje modemskog povezivanja" - "Uključena je žarišna točka ili modemsko povezivanje" - "U roamingu su mogući dodatni troškovi" + "Modemsko povezivanje nema internet" + "Uređaji se ne mogu povezati" + "Isključi modemsko povezivanje" + "Uključena je žarišna točka ili modemsko povezivanje" + "U roamingu su mogući dodatni troškovi" diff --git a/Tethering/res/values-mcc310-mnc004-hu/strings.xml b/Tethering/res/values-mcc310-mnc004-hu/strings.xml index 21c689a44e..6ab95651e2 100644 --- a/Tethering/res/values-mcc310-mnc004-hu/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-hu/strings.xml @@ -16,9 +16,9 @@ - "Nincs internetkapcsolat az internet megosztásához" - "Az eszközök nem tudnak csatlakozni" - "Internetmegosztás kikapcsolása" - "A hotspot vagy az internetmegosztás be van kapcsolva" - "Roaming során további díjak léphetnek fel" + "Nincs internetkapcsolat az internet megosztásához" + "Az eszközök nem tudnak csatlakozni" + "Internetmegosztás kikapcsolása" + "A hotspot vagy az internetmegosztás be van kapcsolva" + "Roaming során további díjak léphetnek fel" diff --git a/Tethering/res/values-mcc310-mnc004-hy/strings.xml b/Tethering/res/values-mcc310-mnc004-hy/strings.xml index 689d92870e..75b1c3e6a7 100644 --- a/Tethering/res/values-mcc310-mnc004-hy/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-hy/strings.xml @@ -16,9 +16,9 @@ - "Մոդեմի ռեժիմի կապը բացակայում է" - "Չհաջողվեց միացնել սարքը" - "Անջատել մոդեմի ռեժիմը" - "Թեժ կետը կամ մոդեմի ռեժիմը միացված է" - "Ռոումինգում կարող են լրացուցիչ վճարներ գանձվել" + "Մոդեմի ռեժիմի ինտերնետ կապը բացակայում է" + "Չհաջողվեց միացնել սարքերը" + "Անջատել մոդեմի ռեժիմը" + "Թեժ կետը կամ մոդեմի ռեժիմը միացված է" + "Ռոումինգում կարող են լրացուցիչ վճարներ գանձվել" diff --git a/Tethering/res/values-mcc310-mnc004-in/strings.xml b/Tethering/res/values-mcc310-mnc004-in/strings.xml index a5f4d19abf..7289d631f8 100644 --- a/Tethering/res/values-mcc310-mnc004-in/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-in/strings.xml @@ -16,9 +16,9 @@ - "Tidak ada koneksi internet di tethering" - "Perangkat tidak dapat terhubung" - "Nonaktifkan tethering" - "Hotspot atau tethering aktif" - "Biaya tambahan mungkin berlaku saat roaming" + "Tidak ada koneksi internet di tethering" + "Perangkat tidak dapat terhubung" + "Nonaktifkan tethering" + "Hotspot atau tethering aktif" + "Biaya tambahan mungkin berlaku saat roaming" diff --git a/Tethering/res/values-mcc310-mnc004-is/strings.xml b/Tethering/res/values-mcc310-mnc004-is/strings.xml index fc7e8aaf4e..e2f2f9dff5 100644 --- a/Tethering/res/values-mcc310-mnc004-is/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-is/strings.xml @@ -16,9 +16,9 @@ - "Tjóðrun er ekki með internettengingu" - "Tæki geta ekki tengst" - "Slökkva á tjóðrun" - "Kveikt er á heitum reit eða tjóðrun" - "Viðbótargjöld kunna að eiga við í reiki" + "Tjóðrun er ekki með internettengingu" + "Tæki geta ekki tengst" + "Slökkva á tjóðrun" + "Kveikt er á heitum reit eða tjóðrun" + "Viðbótargjöld kunna að eiga við í reiki" diff --git a/Tethering/res/values-mcc310-mnc004-it/strings.xml b/Tethering/res/values-mcc310-mnc004-it/strings.xml index 6456dd1b80..44805bd151 100644 --- a/Tethering/res/values-mcc310-mnc004-it/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-it/strings.xml @@ -16,9 +16,9 @@ - "Nessuna connessione a Internet per il tethering" - "Impossibile connettere i dispositivi" - "Disattiva il tethering" - "Hotspot o tethering attivi" - "Potrebbero essere applicati costi aggiuntivi durante il roaming" + "Nessuna connessione a internet per il tethering" + "Impossibile connettere i dispositivi" + "Disattiva il tethering" + "Hotspot o tethering attivo" + "Potrebbero essere applicati costi aggiuntivi durante il roaming" diff --git a/Tethering/res/values-mcc310-mnc004-iw/strings.xml b/Tethering/res/values-mcc310-mnc004-iw/strings.xml index 46b24bd3c5..061816971e 100644 --- a/Tethering/res/values-mcc310-mnc004-iw/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-iw/strings.xml @@ -16,9 +16,9 @@ - "אי אפשר להפעיל את תכונת שיתוף האינטרנט בין מכשירים כי אין חיבור לאינטרנט" - "למכשירים אין אפשרות להתחבר" - "השבתה של שיתוף האינטרנט בין מכשירים" - "תכונת הנקודה לשיתוף אינטרנט או תכונת שיתוף האינטרנט בין מכשירים פועלת" - "ייתכנו חיובים נוספים בעת נדידה" + "אי אפשר להפעיל את תכונת שיתוף האינטרנט בין מכשירים כי אין חיבור לאינטרנט" + "למכשירים אין אפשרות להתחבר" + "השבתה של שיתוף האינטרנט בין מכשירים" + "תכונת הנקודה לשיתוף אינטרנט או תכונת שיתוף האינטרנט בין מכשירים פועלת" + "ייתכנו חיובים נוספים במהלך נדידה" diff --git a/Tethering/res/values-mcc310-mnc004-ja/strings.xml b/Tethering/res/values-mcc310-mnc004-ja/strings.xml index e6eb277b90..344167daff 100644 --- a/Tethering/res/values-mcc310-mnc004-ja/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-ja/strings.xml @@ -16,9 +16,9 @@ - "テザリングがインターネットに接続されていません" - "デバイスを接続できません" - "テザリングを OFF にする" - "アクセス ポイントまたはテザリングが ON です" - "ローミング時に追加料金が発生することがあります" + "テザリングがインターネットに接続されていません" + "デバイスを接続できません" + "テザリングを OFF にする" + "アクセス ポイントまたはテザリングが ON です" + "ローミング時に追加料金が発生することがあります" diff --git a/Tethering/res/values-mcc310-mnc004-ka/strings.xml b/Tethering/res/values-mcc310-mnc004-ka/strings.xml index aeddd7101d..20db7fc8f2 100644 --- a/Tethering/res/values-mcc310-mnc004-ka/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-ka/strings.xml @@ -16,9 +16,9 @@ - "ტეტერინგს არ აქვს ინტერნეტზე წვდომა" - "მოწყობილობები ვერ ახერხებენ დაკავშირებას" - "ტეტერინგის გამორთვა" - "ჩართულია უსადენო ქსელი ან ტეტერინგი" - "როუმინგის გამოყენებისას შეიძლება ჩამოგეჭრათ დამატებითი საფასური" + "ტეტერინგს არ აქვს ინტერნეტზე წვდომა" + "მოწყობილობები ვერ ახერხებენ დაკავშირებას" + "ტეტერინგის გამორთვა" + "ჩართულია უსადენო ქსელი ან ტეტერინგი" + "როუმინგის გამოყენებისას შეიძლება ჩამოგეჭრათ დამატებითი საფასური" diff --git a/Tethering/res/values-mcc310-mnc004-kk/strings.xml b/Tethering/res/values-mcc310-mnc004-kk/strings.xml index 255f0a276f..35f1738905 100644 --- a/Tethering/res/values-mcc310-mnc004-kk/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-kk/strings.xml @@ -16,9 +16,9 @@ - "Тетеринг режимі интернет байланысынсыз пайдаланылуда" - "Құрылғыларды байланыстыру мүмкін емес" - "Тетерингіні өшіру" - "Хотспот немесе тетеринг қосулы" - "Роуминг кезінде қосымша ақы алынуы мүмкін." + "Тетеринг кезінде интернет байланысы жоқ" + "Құрылғыларды байланыстыру мүмкін емес" + "Тетерингіні өшіру" + "Хотспот немесе тетеринг қосулы" + "Роуминг кезінде қосымша ақы алынуы мүмкін." diff --git a/Tethering/res/values-mcc310-mnc004-km/strings.xml b/Tethering/res/values-mcc310-mnc004-km/strings.xml index 2bceb1cf77..2af80b1b3b 100644 --- a/Tethering/res/values-mcc310-mnc004-km/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-km/strings.xml @@ -16,9 +16,9 @@ - "ការភ្ជាប់​មិនមានអ៊ីនធឺណិត​ទេ" - "មិនអាច​ភ្ជាប់ឧបករណ៍​បានទេ" - "បិទការភ្ជាប់" - "ហតស្ប៉ត ឬការភ្ជាប់​ត្រូវបានបើក" - "អាចមាន​ការគិតថ្លៃ​បន្ថែម នៅពេល​រ៉ូមីង" + "ការភ្ជាប់​មិនមានអ៊ីនធឺណិត​ទេ" + "មិនអាច​ភ្ជាប់ឧបករណ៍​បានទេ" + "បិទការភ្ជាប់" + "ហតស្ប៉ត ឬការភ្ជាប់​ត្រូវបានបើក" + "អាចមាន​ការគិតថ្លៃ​បន្ថែម នៅពេល​រ៉ូមីង" diff --git a/Tethering/res/values-mcc310-mnc004-kn/strings.xml b/Tethering/res/values-mcc310-mnc004-kn/strings.xml index ed769305a6..16c55d0373 100644 --- a/Tethering/res/values-mcc310-mnc004-kn/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-kn/strings.xml @@ -16,9 +16,9 @@ - "ಟೆಥರಿಂಗ್‌ ಯಾವುದೇ ಇಂಟರ್ನೆಟ್ ಕನೆಕ್ಷನ್ ಹೊಂದಿಲ್ಲ" - "ಸಾಧನಗಳನ್ನು ಕನೆಕ್ಟ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ" - "ಟೆಥರಿಂಗ್‌ ಆಫ್ ಮಾಡಿ" - "ಹಾಟ್‌ಸ್ಪಾಟ್ ಅಥವಾ ಟೆಥರಿಂಗ್‌ ಆನ್ ಆಗಿದೆ" - "ರೋಮಿಂಗ್‌ನಲ್ಲಿರುವಾಗ ಹೆಚ್ಚುವರಿ ಶುಲ್ಕಗಳು ಅನ್ವಯವಾಗಬಹುದು" + "ಟೆಥರಿಂಗ್‌ ಯಾವುದೇ ಇಂಟರ್ನೆಟ್ ಕನೆಕ್ಷನ್ ಹೊಂದಿಲ್ಲ" + "ಸಾಧನಗಳನ್ನು ಕನೆಕ್ಟ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ" + "ಟೆಥರಿಂಗ್‌ ಆಫ್ ಮಾಡಿ" + "ಹಾಟ್‌ಸ್ಪಾಟ್ ಅಥವಾ ಟೆಥರಿಂಗ್‌ ಆನ್ ಆಗಿದೆ" + "ರೋಮಿಂಗ್‌ನಲ್ಲಿರುವಾಗ ಹೆಚ್ಚುವರಿ ಶುಲ್ಕಗಳು ಅನ್ವಯವಾಗಬಹುದು" diff --git a/Tethering/res/values-mcc310-mnc004-ko/strings.xml b/Tethering/res/values-mcc310-mnc004-ko/strings.xml index 6e504941eb..619504fb6e 100644 --- a/Tethering/res/values-mcc310-mnc004-ko/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-ko/strings.xml @@ -16,9 +16,9 @@ - "테더링으로 인터넷을 사용할 수 없음" - "기기에서 연결할 수 없음" - "테더링 사용 중지" - "핫스팟 또는 테더링 켜짐" - "로밍 중에는 추가 요금이 발생할 수 있습니다." + "테더링으로 인터넷을 사용할 수 없음" + "기기에서 연결할 수 없음" + "테더링 사용 중지" + "핫스팟 또는 테더링이 켜짐" + "로밍 중에는 추가 요금이 부과될 수 있습니다." diff --git a/Tethering/res/values-mcc310-mnc004-ky/strings.xml b/Tethering/res/values-mcc310-mnc004-ky/strings.xml index d68128b9a5..f52dd90cdf 100644 --- a/Tethering/res/values-mcc310-mnc004-ky/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-ky/strings.xml @@ -16,9 +16,9 @@ - "Модем режими Интернети жок колдонулууда" - "Түзмөктөр туташпай жатат" - "Модем режимин өчүрүү" - "Байланыш түйүнү же модем режими күйүк" - "Роумингде кошумча акы алынышы мүмкүн" + "Модем режими Интернети жок колдонулууда" + "Түзмөктөр туташпай жатат" + "Модем режимин өчүрүү" + "Байланыш түйүнү же модем режими күйүк" + "Роумингде кошумча акы алынышы мүмкүн" diff --git a/Tethering/res/values-mcc310-mnc004-lo/strings.xml b/Tethering/res/values-mcc310-mnc004-lo/strings.xml index 03e134a0fc..d3184f78d7 100644 --- a/Tethering/res/values-mcc310-mnc004-lo/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-lo/strings.xml @@ -16,9 +16,9 @@ - "ການປ່ອຍສັນຍານບໍ່ມີອິນເຕີເນັດ" - "ອຸປະກອນບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້" - "ປິດການປ່ອຍສັນຍານ" - "ເປີດໃຊ້ຮັອດສະປອດ ຫຼື ການປ່ອຍສັນຍານຢູ່" - "ອາດມີຄ່າໃຊ້ຈ່າຍເພີ່ມເຕີມໃນລະຫວ່າງການໂຣມມິງ" + "ການປ່ອຍສັນຍານບໍ່ມີອິນເຕີເນັດ" + "ອຸປະກອນບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້" + "ປິດການປ່ອຍສັນຍານ" + "ຮັອດສະປອດ ຫຼື ການປ່ອຍສັນຍານເປີດຢູ່" + "ອາດມີຄ່າບໍລິການເພີ່ມເຕີມໃນລະຫວ່າງການໂຣມມິງ" diff --git a/Tethering/res/values-mcc310-mnc004-lt/strings.xml b/Tethering/res/values-mcc310-mnc004-lt/strings.xml index 652cedc6e6..a07644dc91 100644 --- a/Tethering/res/values-mcc310-mnc004-lt/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-lt/strings.xml @@ -16,9 +16,9 @@ - "Nėra įrenginio kaip modemo naudojimo interneto ryšio" - "Nepavyko susieti įrenginių" - "Išjungti įrenginio kaip modemo naudojimą" - "Įjungtas viešosios interneto prieigos taškas arba įrenginio kaip modemo naudojimas" - "Veikiant tarptinkliniam ryšiui gali būti taikomi papildomi mokesčiai" + "Nėra įrenginio kaip modemo naudojimo interneto ryšio" + "Nepavyko susieti įrenginių" + "Išjungti įrenginio kaip modemo naudojimą" + "Įjungtas viešosios interneto prieigos taškas arba įrenginio kaip modemo naudojimas" + "Veikiant tarptinkliniam ryšiui gali būti taikomi papildomi mokesčiai" diff --git a/Tethering/res/values-mcc310-mnc004-lv/strings.xml b/Tethering/res/values-mcc310-mnc004-lv/strings.xml index 221972298c..5090ecfc05 100644 --- a/Tethering/res/values-mcc310-mnc004-lv/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-lv/strings.xml @@ -16,9 +16,9 @@ - "Piesaistei nav interneta savienojuma" - "Nevar savienot ierīces" - "Izslēgt piesaisti" - "Ir ieslēgts tīklājs vai piesaiste" - "Viesabonēšanas laikā var tikt piemērota papildu samaksa" + "Piesaistei nav interneta savienojuma" + "Nevar savienot ierīces" + "Izslēgt piesaisti" + "Ir ieslēgts tīklājs vai piesaiste" + "Viesabonēšanas laikā var tikt piemērota papildu maksa." diff --git a/Tethering/res/values-mcc310-mnc004-mk/strings.xml b/Tethering/res/values-mcc310-mnc004-mk/strings.xml index 227f9e3466..c95c80e768 100644 --- a/Tethering/res/values-mcc310-mnc004-mk/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-mk/strings.xml @@ -16,9 +16,9 @@ - "Нема интернет преку мобилен" - "Уредите не може да се поврзат" - "Исклучи интернет преку мобилен" - "Точката на пристап или интернетот преку мобилен е вклучен" - "При роаминг може да се наплатат дополнителни трошоци" + "Нема интернет преку мобилен" + "Уредите не може да се поврзат" + "Исклучи интернет преку мобилен" + "Вклучено: точка на пристап или интернет преку мобилен" + "При роаминг може да се наплатат дополнителни трошоци" diff --git a/Tethering/res/values-mcc310-mnc004-ml/strings.xml b/Tethering/res/values-mcc310-mnc004-ml/strings.xml index ec43885126..7bad5c1760 100644 --- a/Tethering/res/values-mcc310-mnc004-ml/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-ml/strings.xml @@ -16,9 +16,9 @@ - "ടെതറിംഗിന് ഇന്റർനെറ്റ് ഇല്ല" - "ഉപകരണങ്ങൾ കണക്റ്റ് ചെയ്യാനാവില്ല" - "ടെതറിംഗ് ഓഫാക്കുക" - "ഹോട്ട്‌സ്‌പോട്ട് അല്ലെങ്കിൽ ടെതറിംഗ് ഓണാണ്" - "റോമിംഗ് ചെയ്യുമ്പോൾ അധിക നിരക്കുകൾ ബാധകമായേക്കാം" + "ടെതറിംഗിന് ഇന്റർനെറ്റ് ഇല്ല" + "ഉപകരണങ്ങൾ കണക്റ്റ് ചെയ്യാനാവില്ല" + "ടെതറിംഗ് ഓഫാക്കുക" + "ഹോട്ട്‌സ്‌പോട്ട് അല്ലെങ്കിൽ ടെതറിംഗ് ഓണാണ്" + "റോമിംഗ് ചെയ്യുമ്പോൾ അധിക നിരക്കുകൾ ബാധകമായേക്കാം" diff --git a/Tethering/res/values-mcc310-mnc004-mn/strings.xml b/Tethering/res/values-mcc310-mnc004-mn/strings.xml index e263573799..ff76236f06 100644 --- a/Tethering/res/values-mcc310-mnc004-mn/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-mn/strings.xml @@ -16,9 +16,9 @@ - "Модемд интернэт алга байна" - "Төхөөрөмжүүд холбогдох боломжгүй байна" - "Модем болгохыг унтраах" - "Сүлжээний цэг эсвэл модем болгох асаалттай байна" - "Роумингийн үеэр нэмэлт төлбөр нэхэмжилж болзошгүй" + "Модем болгоход ямар ч интернэт байхгүй байна" + "Төхөөрөмжүүд холбогдох боломжгүй байна" + "Модем болгохыг унтраах" + "Сүлжээний цэг эсвэл модем болгох асаалттай байна" + "Роумингийн үеэр нэмэлт төлбөр тооцогдож магадгүй" diff --git a/Tethering/res/values-mcc310-mnc004-mr/strings.xml b/Tethering/res/values-mcc310-mnc004-mr/strings.xml index adf845d078..1754dd45d5 100644 --- a/Tethering/res/values-mcc310-mnc004-mr/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-mr/strings.xml @@ -16,9 +16,9 @@ - "टेदरिंगला इंटरनेट नाही" - "डिव्हाइस कनेक्ट होऊ शकत नाहीत" - "टेदरिंग बंद करा" - "हॉटस्पॉट किंवा टेदरिंग सुरू आहे" - "रोमिंगदरम्यान अतिरिक्त शुल्क लागू होऊ शकतात" + "टेदरिंगसाठी इंटरनेट नाही" + "डिव्हाइस कनेक्ट होऊ शकत नाहीत" + "टेदरिंग बंद करा" + "हॉटस्पॉट किंवा टेदरिंग सुरू आहे" + "रोमिंगदरम्यान अतिरिक्त शुल्के लागू होऊ शकतात" diff --git a/Tethering/res/values-mcc310-mnc004-ms/strings.xml b/Tethering/res/values-mcc310-mnc004-ms/strings.xml index f65c451e4c..343e6fa347 100644 --- a/Tethering/res/values-mcc310-mnc004-ms/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-ms/strings.xml @@ -16,9 +16,9 @@ - "Penambatan tiada Internet" - "Peranti tidak dapat disambungkan" - "Matikan penambatan" - "Tempat liputan atau penambatan dihidupkan" - "Caj tambahan mungkin digunakan semasa perayauan" + "Penambatan tiada Internet" + "Peranti tidak dapat disambungkan" + "Matikan penambatan" + "Tempat liputan atau penambatan dihidupkan" + "Caj tambahan boleh dikenakan semasa perayauan" diff --git a/Tethering/res/values-mcc310-mnc004-my/strings.xml b/Tethering/res/values-mcc310-mnc004-my/strings.xml index 4118e775cd..152f468989 100644 --- a/Tethering/res/values-mcc310-mnc004-my/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-my/strings.xml @@ -16,9 +16,9 @@ - "မိုဘိုင်းဖုန်းသုံး ချိတ်ဆက်မျှဝေခြင်းတွင် အင်တာနက် မရှိပါ" - "စက်များ ချိတ်ဆက်၍ မရပါ" - "မိုဘိုင်းဖုန်းသုံး ချိတ်ဆက်မျှဝေခြင်း ပိတ်ရန်" - "ဟော့စပေါ့ (သို့) မိုဘိုင်းဖုန်းသုံး ချိတ်ဆက်မျှဝေခြင်း ဖွင့်ထားသည်" - "ပြင်ပကွန်ရက်နှင့် ချိတ်ဆက်သည့်အခါ နောက်ထပ်ကျသင့်မှုများ ရှိနိုင်သည်" + "မိုဘိုင်းသုံး၍ ချိတ်ဆက်ခြင်းတွင် အင်တာနက် မရှိပါ" + "စက်ပစ္စည်းများကို ချိတ်ဆက်၍မရပါ" + "မိုဘိုင်းသုံး၍ ချိတ်ဆက်ခြင်း ပိတ်ရန်" + "ဟော့စပေါ့ (သို့) မိုဘိုင်းသုံး၍ ချိတ်ဆက်ခြင်း ဖွင့်ထားသည်" + "ပြင်ပကွန်ရက်သုံးနေစဉ် နောက်ထပ်ကျသင့်ငွေ ပေးရနိုင်သည်" diff --git a/Tethering/res/values-mcc310-mnc004-nb/strings.xml b/Tethering/res/values-mcc310-mnc004-nb/strings.xml index 36853583ce..31895d1c8c 100644 --- a/Tethering/res/values-mcc310-mnc004-nb/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-nb/strings.xml @@ -16,9 +16,9 @@ - "Internettdeling har ikke internettilgang" - "Enhetene kan ikke koble til" - "Slå av internettdeling" - "Wi-Fi-sone eller internettdeling er på" - "Ytterligere kostnader kan påløpe under roaming" + "Internettdeling har ikke internettilgang" + "Enheter kan ikke koble til" + "Slå av internettdeling" + "Wifi-sone eller internettdeling er på" + "Det kan påløpe flere kostnader ved roaming" diff --git a/Tethering/res/values-mcc310-mnc004-ne/strings.xml b/Tethering/res/values-mcc310-mnc004-ne/strings.xml index d074f15699..4b5077387e 100644 --- a/Tethering/res/values-mcc310-mnc004-ne/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-ne/strings.xml @@ -16,9 +16,9 @@ - "टेदरिङमार्फत इन्टरनेट कनेक्सन प्राप्त हुन सकेन" - "यन्त्रहरू कनेक्ट गर्न सकिएन" - "टेदरिङ निष्क्रिय पार्नुहोस्" - "हटस्पट वा टेदरिङ सक्रिय छ" - "रोमिङ सेवा प्रयोग गर्दा अतिरिक्त शुल्क लाग्न सक्छ" + "टेदरिङमार्फत इन्टरनेट कनेक्ट गर्न सकिएन" + "डिभाइसहरू कनेक्ट गर्न सकिएन" + "टेदरिङ अफ गर्नुहोस्" + "हटस्पट वा टेदरिङ अन छ" + "रोमिङ सेवा प्रयोग गर्दा अतिरिक्त शुल्क लाग्न सक्छ" diff --git a/Tethering/res/values-mcc310-mnc004-nl/strings.xml b/Tethering/res/values-mcc310-mnc004-nl/strings.xml index 1d888942f4..8af41fde4d 100644 --- a/Tethering/res/values-mcc310-mnc004-nl/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-nl/strings.xml @@ -16,9 +16,9 @@ - "Tethering heeft geen internet" - "Apparaten kunnen niet worden verbonden" - "Tethering uitschakelen" - "Hotspot of tethering is ingeschakeld" - "Er kunnen extra kosten voor roaming in rekening worden gebracht." + "Tethering heeft geen internet" + "Apparaten kunnen geen verbinding maken" + "Tethering uitzetten" + "Hotspot of tethering staat aan" + "Er kunnen extra kosten voor roaming in rekening worden gebracht" diff --git a/Tethering/res/values-mcc310-mnc004-or/strings.xml b/Tethering/res/values-mcc310-mnc004-or/strings.xml index 8038815fe8..6eb0773e9b 100644 --- a/Tethering/res/values-mcc310-mnc004-or/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-or/strings.xml @@ -16,9 +16,9 @@ - "ଟିଥରିଂ ପାଇଁ କୌଣସି ଇଣ୍ଟର୍ନେଟ୍ ସଂଯୋଗ ନାହିଁ" - "ଡିଭାଇସଗୁଡ଼ିକ ସଂଯୋଗ କରାଯାଇପାରିବ ନାହିଁ" - "ଟିଥରିଂ ବନ୍ଦ କରନ୍ତୁ" - "ହଟସ୍ପଟ୍ କିମ୍ବା ଟିଥରିଂ ଚାଲୁ ଅଛି" - "ରୋମିଂରେ ଥିବା ସମୟରେ ଅତିରିକ୍ତ ଶୁଳ୍କ ଲାଗୁ ହୋଇପାରେ" + "ଟିଥରିଂ ପାଇଁ କୌଣସି ଇଣ୍ଟରନେଟ କନେକ୍ସନ ନାହିଁ" + "ଡିଭାଇସଗୁଡ଼ିକୁ କନେକ୍ଟ କରାଯାଇପାରିବ ନାହିଁ" + "ଟିଥରିଂକୁ ବନ୍ଦ କରନ୍ତୁ" + "ହଟସ୍ପଟ କିମ୍ବା ଟିଥରିଂ ଚାଲୁ ଅଛି" + "ରୋମିଂ ସମୟରେ ଅତିରିକ୍ତ ଚାର୍ଜ ଲାଗୁ ହୋଇପାରେ" diff --git a/Tethering/res/values-mcc310-mnc004-pa/strings.xml b/Tethering/res/values-mcc310-mnc004-pa/strings.xml index 819833eab0..28181e2ba2 100644 --- a/Tethering/res/values-mcc310-mnc004-pa/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-pa/strings.xml @@ -16,9 +16,9 @@ - "ਟੈਦਰਿੰਗ ਕੋਲ ਇੰਟਰਨੈੱਟ ਪਹੁੰਚ ਨਹੀਂ ਹੈ" - "ਡੀਵਾਈਸ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ" - "ਟੈਦਰਿੰਗ ਬੰਦ ਕਰੋ" - "ਹੌਟਸਪੌਟ ਜਾਂ ਟੈਦਰਿੰਗ ਚਾਲੂ ਹੈ" - "ਰੋਮਿੰਗ ਦੌਰਾਨ ਵਧੀਕ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ" + "ਟੈਦਰਿੰਗ ਕੋਲ ਇੰਟਰਨੈੱਟ ਪਹੁੰਚ ਨਹੀਂ ਹੈ" + "ਡੀਵਾਈਸ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ" + "ਟੈਦਰਿੰਗ ਬੰਦ ਕਰੋ" + "ਹੌਟਸਪੌਟ ਜਾਂ ਟੈਦਰਿੰਗ ਚਾਲੂ ਹੈ" + "ਰੋਮਿੰਗ ਦੌਰਾਨ ਵਧੀਕ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ" diff --git a/Tethering/res/values-mcc310-mnc004-pl/strings.xml b/Tethering/res/values-mcc310-mnc004-pl/strings.xml index 65e4380e39..816302a976 100644 --- a/Tethering/res/values-mcc310-mnc004-pl/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-pl/strings.xml @@ -16,9 +16,9 @@ - "Tethering nie ma internetu" - "Urządzenia nie mogą się połączyć" - "Wyłącz tethering" - "Hotspot lub tethering jest włączony" - "Podczas korzystania z roamingu mogą zostać naliczone dodatkowe opłaty" + "Tethering nie ma internetu" + "Urządzenia nie mogą się połączyć" + "Wyłącz tethering" + "Hotspot lub tethering jest włączony" + "Podczas korzystania z roamingu mogą zostać naliczone dodatkowe opłaty" diff --git a/Tethering/res/values-mcc310-mnc004-pt-rBR/strings.xml b/Tethering/res/values-mcc310-mnc004-pt-rBR/strings.xml index d8866170c1..55767c224a 100644 --- a/Tethering/res/values-mcc310-mnc004-pt-rBR/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-pt-rBR/strings.xml @@ -16,9 +16,9 @@ - "O tethering não tem Internet" - "Não é possível conectar os dispositivos" - "Desativar o tethering" - "Ponto de acesso ou tethering ativado" - "Pode haver cobranças extras durante o roaming" + "O tethering não tem uma conexão de Internet" + "Não é possível conectar os dispositivos" + "Desativar o tethering" + "O ponto de acesso ou tethering está ativado" + "Pode haver cobranças extras durante o roaming" diff --git a/Tethering/res/values-mcc310-mnc004-pt-rPT/strings.xml b/Tethering/res/values-mcc310-mnc004-pt-rPT/strings.xml index bfd45ca0a3..eccabf8b34 100644 --- a/Tethering/res/values-mcc310-mnc004-pt-rPT/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-pt-rPT/strings.xml @@ -16,9 +16,9 @@ - "A ligação (à Internet) via telemóvel não tem Internet" - "Não é possível ligar os dispositivos" - "Desativar ligação (à Internet) via telemóvel" - "A zona Wi-Fi ou a ligação (à Internet) via telemóvel está ativada" - "Podem aplicar-se custos adicionais em roaming." + "A ligação (à Internet) via telemóvel não tem Internet" + "Não é possível ligar os dispositivos" + "Desativar ligação (à Internet) via telemóvel" + "A zona Wi-Fi ou a ligação (à Internet) via telemóvel está ativada" + "Podem aplicar-se custos adicionais em roaming" diff --git a/Tethering/res/values-mcc310-mnc004-pt/strings.xml b/Tethering/res/values-mcc310-mnc004-pt/strings.xml index d8866170c1..55767c224a 100644 --- a/Tethering/res/values-mcc310-mnc004-pt/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-pt/strings.xml @@ -16,9 +16,9 @@ - "O tethering não tem Internet" - "Não é possível conectar os dispositivos" - "Desativar o tethering" - "Ponto de acesso ou tethering ativado" - "Pode haver cobranças extras durante o roaming" + "O tethering não tem uma conexão de Internet" + "Não é possível conectar os dispositivos" + "Desativar o tethering" + "O ponto de acesso ou tethering está ativado" + "Pode haver cobranças extras durante o roaming" diff --git a/Tethering/res/values-mcc310-mnc004-ro/strings.xml b/Tethering/res/values-mcc310-mnc004-ro/strings.xml index 8d87a9e516..3c3d7bcc39 100644 --- a/Tethering/res/values-mcc310-mnc004-ro/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-ro/strings.xml @@ -16,9 +16,9 @@ - "Procesul de tethering nu are internet" - "Dispozitivele nu se pot conecta" - "Dezactivați procesul de tethering" - "S-a activat hotspotul sau tethering" - "Se pot aplica taxe suplimentare pentru roaming" + "Procesul de tethering nu are internet" + "Dispozitivele nu se pot conecta" + "Dezactivează tetheringul" + "S-a activat hotspotul sau tetheringul" + "Se pot aplica taxe suplimentare pentru roaming" diff --git a/Tethering/res/values-mcc310-mnc004-ru/strings.xml b/Tethering/res/values-mcc310-mnc004-ru/strings.xml index dbdb9ebe49..76671801ce 100644 --- a/Tethering/res/values-mcc310-mnc004-ru/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-ru/strings.xml @@ -16,9 +16,9 @@ - "Режим модема используется без доступа к Интернету" - "Невозможно подключить устройства." - "Отключить режим модема" - "Включены точка доступа или режим модема" - "За использование услуг связи в роуминге может взиматься дополнительная плата." + "Режим модема используется без доступа к интернету" + "Невозможно подключить устройства." + "Отключить режим модема" + "Включена точка доступа или режим модема" + "За использование услуг связи в роуминге может взиматься дополнительная плата." diff --git a/Tethering/res/values-mcc310-mnc004-si/strings.xml b/Tethering/res/values-mcc310-mnc004-si/strings.xml index d8301e41c2..0c88a39db0 100644 --- a/Tethering/res/values-mcc310-mnc004-si/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-si/strings.xml @@ -16,9 +16,9 @@ - "ටෙදරින් හට අන්තර්ජාලය නැත" - "උපාංගවලට සම්බන්ධ විය නොහැකිය" - "ටෙදරින් ක්‍රියාවිරහිත කරන්න" - "හොට්ස්පොට් හෝ ටෙදරින් ක්‍රියාත්මකයි" - "රෝමිං අතරතුර අමතර ගාස්තු අදාළ විය හැකිය" + "ටෙදරින් හට අන්තර්ජාලය නැත" + "උපාංගවලට සම්බන්ධ විය නොහැක" + "ටෙදරින් ක්‍රියාවිරහිත කරන්න" + "හොට්ස්පොට් හෝ ටෙදරින් ක්‍රියාත්මකයි" + "රෝමිං අතරේ අතිරේක ගාස්තු අදාළ විය හැක" diff --git a/Tethering/res/values-mcc310-mnc004-sk/strings.xml b/Tethering/res/values-mcc310-mnc004-sk/strings.xml index bef71363f4..c3b941e7b7 100644 --- a/Tethering/res/values-mcc310-mnc004-sk/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-sk/strings.xml @@ -16,9 +16,9 @@ - "Tethering nemá internetové pripojenie" - "Zariadenia sa nemôžu pripojiť" - "Vypnúť tethering" - "Je zapnutý hotspot alebo tethering" - "Počas roamingu vám môžu byť účtované ďalšie poplatky" + "Tethering nemá internetové pripojenie" + "Zariadenia sa nemôžu pripojiť" + "Vypnúť tethering" + "Je zapnutý hotspot alebo tethering" + "Počas roamingu vám môžu byť účtované ďalšie poplatky" diff --git a/Tethering/res/values-mcc310-mnc004-sl/strings.xml b/Tethering/res/values-mcc310-mnc004-sl/strings.xml index 3202c62e8a..6573475d7d 100644 --- a/Tethering/res/values-mcc310-mnc004-sl/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-sl/strings.xml @@ -16,9 +16,9 @@ - "Internetna povezava prek mobilnega telefona ni vzpostavljena" - "Napravi se ne moreta povezati" - "Izklopi internetno povezavo prek mobilnega telefona" - "Dostopna točka ali internetna povezava prek mobilnega telefona je vklopljena" - "Med gostovanjem lahko nastanejo dodatni stroški" + "Povezava računalnika z internetom prek mobilnega telefona nima internetne povezave" + "Napravi se ne moreta povezati" + "Izklopi povezavo računalnika z internetom prek mobilnega telefona" + "Dostopna točka ali povezava računalnika z internetom prek mobilnega telefona je vklopljena" + "Med gostovanjem lahko nastanejo dodatni stroški." diff --git a/Tethering/res/values-mcc310-mnc004-sq/strings.xml b/Tethering/res/values-mcc310-mnc004-sq/strings.xml index 37f6ad2868..93ea2314c9 100644 --- a/Tethering/res/values-mcc310-mnc004-sq/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-sq/strings.xml @@ -16,9 +16,9 @@ - "Ndarja e internetit nuk ka internet" - "Pajisjet nuk mund të lidhen" - "Çaktivizo ndarjen e internetit" - "Zona e qasjes për internet ose ndarja e internetit është aktive" - "Mund të zbatohen tarifime shtesë kur je në roaming" + "Ndarja e internetit nuk ka internet" + "Pajisjet nuk mund të lidhen" + "Çaktivizo ndarjen e internetit" + "Zona e qasjes për internet ose ndarja e internetit është aktive" + "Mund të zbatohen tarifime shtesë kur je në roaming" diff --git a/Tethering/res/values-mcc310-mnc004-sr/strings.xml b/Tethering/res/values-mcc310-mnc004-sr/strings.xml index 5566d03ed1..e8fb4784e8 100644 --- a/Tethering/res/values-mcc310-mnc004-sr/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-sr/strings.xml @@ -16,9 +16,9 @@ - "Привезивање нема приступ интернету" - "Повезивање уређаја није успело" - "Искључи привезивање" - "Укључен је хотспот или привезивање" - "Можда важе додатни трошкови у ромингу" + "Привезивање нема приступ интернету" + "Повезивање уређаја није успело" + "Искључи привезивање" + "Укључен је хотспот или привезивање" + "Можда важе додатни трошкови у ромингу" diff --git a/Tethering/res/values-mcc310-mnc004-sv/strings.xml b/Tethering/res/values-mcc310-mnc004-sv/strings.xml index 9765acd0cf..6fc1747f20 100644 --- a/Tethering/res/values-mcc310-mnc004-sv/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-sv/strings.xml @@ -16,9 +16,9 @@ - "Det finns ingen internetanslutning för internetdelningen" - "Enheterna kan inte anslutas" - "Inaktivera internetdelning" - "Surfzon eller internetdelning har aktiverats" - "Ytterligare avgifter kan tillkomma vid roaming" + "Det finns ingen internetanslutning för internetdelningen" + "Enheterna kan inte anslutas" + "Inaktivera internetdelning" + "Surfzon eller internetdelning har aktiverats" + "Ytterligare avgifter kan tillkomma vid roaming" diff --git a/Tethering/res/values-mcc310-mnc004-sw/strings.xml b/Tethering/res/values-mcc310-mnc004-sw/strings.xml index cf850c9cd2..73a7026ae2 100644 --- a/Tethering/res/values-mcc310-mnc004-sw/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-sw/strings.xml @@ -16,9 +16,9 @@ - "Kipengele cha kusambaza mtandao hakina intaneti" - "Imeshindwa kuunganisha vifaa" - "Zima kipengele cha kusambaza mtandao" - "Umewasha kipengele cha kusambaza mtandao au mtandao pepe" - "Huenda ukatozwa gharama za ziada ukitumia mitandao ya ng\'ambo" + "Huduma ya kusambaza mtandao haina muunganisho wa intaneti" + "Imeshindwa kuunganisha vifaa" + "Zima kipengele cha kusambaza mtandao" + "Umewasha kipengele cha kusambaza mtandao au mtandao pepe" + "Huenda ukatozwa gharama za ziada ukitumia mitandao ya ng\'ambo" diff --git a/Tethering/res/values-mcc310-mnc004-ta/strings.xml b/Tethering/res/values-mcc310-mnc004-ta/strings.xml index f4b15aab19..436f00b8c2 100644 --- a/Tethering/res/values-mcc310-mnc004-ta/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-ta/strings.xml @@ -16,9 +16,9 @@ - "இணைப்பு முறைக்கு இணைய இணைப்பு இல்லை" - "சாதனங்களால் இணைய முடியவில்லை" - "இணைப்பு முறையை ஆஃப் செய்" - "ஹாட்ஸ்பாட் அல்லது இணைப்பு முறை ஆன் செய்யப்பட்டுள்ளது" - "ரோமிங்கின்போது கூடுதல் கட்டணங்கள் விதிக்கப்படக்கூடும்" + "இணைப்பு முறைக்கு இணைய இணைப்பு இல்லை" + "சாதனங்களால் இணைய முடியவில்லை" + "இணைப்பு முறையை முடக்கு" + "ஹாட்ஸ்பாட் அல்லது இணைப்பு முறை இயக்கப்பட்டுள்ளது" + "ரோமிங்கின்போது கூடுதல் கட்டணங்கள் விதிக்கப்படலாம்" diff --git a/Tethering/res/values-mcc310-mnc004-te/strings.xml b/Tethering/res/values-mcc310-mnc004-te/strings.xml index 937d34d520..ba8362757e 100644 --- a/Tethering/res/values-mcc310-mnc004-te/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-te/strings.xml @@ -16,9 +16,9 @@ - "టెథరింగ్ చేయడానికి ఇంటర్నెట్ కనెక్షన్ లేదు" - "పరికరాలు కనెక్ట్ అవ్వడం లేదు" - "టెథరింగ్‌ను ఆఫ్ చేయండి" - "హాట్‌స్పాట్ లేదా టెథరింగ్ ఆన్‌లో ఉంది" - "రోమింగ్‌లో ఉన్నప్పుడు అదనపు ఛార్జీలు వర్తించవచ్చు" + "టెథరింగ్ చేయడానికి ఇంటర్నెట్ కనెక్షన్ లేదు" + "పరికరాలు కనెక్ట్ అవ్వడం లేదు" + "టెథరింగ్‌ను ఆఫ్ చేయండి" + "హాట్‌స్పాట్ లేదా టెథరింగ్ ఆన్‌లో ఉంది" + "రోమింగ్‌లో ఉన్నప్పుడు అదనపు ఛార్జీలు వర్తించవచ్చు" diff --git a/Tethering/res/values-mcc310-mnc004-th/strings.xml b/Tethering/res/values-mcc310-mnc004-th/strings.xml index f781fae525..e2ea084a37 100644 --- a/Tethering/res/values-mcc310-mnc004-th/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-th/strings.xml @@ -16,9 +16,9 @@ - "การเชื่อมต่ออินเทอร์เน็ตผ่านมือถือไม่มีอินเทอร์เน็ต" - "อุปกรณ์เชื่อมต่อไม่ได้" - "ปิดการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ" - "ฮอตสปอตหรือการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือเปิดอยู่" - "อาจมีค่าใช้จ่ายเพิ่มเติมขณะโรมมิ่ง" + "ไม่มีอินเทอร์เน็ตสำหรับการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ" + "อุปกรณ์เชื่อมต่อไม่ได้" + "ปิดการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ" + "ฮอตสปอตหรือการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือเปิดอยู่" + "อาจมีค่าใช้จ่ายเพิ่มเติมขณะโรมมิ่ง" diff --git a/Tethering/res/values-mcc310-mnc004-tl/strings.xml b/Tethering/res/values-mcc310-mnc004-tl/strings.xml index 8d5d465373..7b4b71c865 100644 --- a/Tethering/res/values-mcc310-mnc004-tl/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-tl/strings.xml @@ -16,9 +16,9 @@ - "Walang internet ang pag-tether" - "Hindi makakonekta ang mga device" - "I-off ang pag-tether" - "Naka-on ang Hotspot o pag-tether" - "Posibleng magkaroon ng mga karagdagang singil habang nagro-roam" + "Walang internet ang pag-tether" + "Hindi makakonekta ang mga device" + "I-off ang pag-tether" + "Naka-on ang hotspot o pag-tether" + "Posibleng magkaroon ng mga karagdagang singil habang nagro-roam" diff --git a/Tethering/res/values-mcc310-mnc004-tr/strings.xml b/Tethering/res/values-mcc310-mnc004-tr/strings.xml index 80cab33ac0..066e1d7b95 100644 --- a/Tethering/res/values-mcc310-mnc004-tr/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-tr/strings.xml @@ -16,9 +16,9 @@ - "Tethering\'in internet bağlantısı yok" - "Cihazlar bağlanamıyor" - "Tethering\'i kapat" - "Hotspot veya tethering açık" - "Dolaşım sırasında ek ücretler uygulanabilir" + "Tethering\'in internet bağlantısı yok" + "Cihazlar bağlanamıyor" + "Tethering\'i kapat" + "Hotspot veya tethering açık" + "Dolaşım sırasında ek ücretler uygulanabilir" diff --git a/Tethering/res/values-mcc310-mnc004-uk/strings.xml b/Tethering/res/values-mcc310-mnc004-uk/strings.xml index c05932a5ae..036746a2ca 100644 --- a/Tethering/res/values-mcc310-mnc004-uk/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-uk/strings.xml @@ -16,9 +16,9 @@ - "Телефон, який використовується як модем, не підключений до Інтернету" - "Не вдається підключити пристрої" - "Вимкнути використання телефона як модема" - "Увімкнено точку доступу або використання телефона як модема" - "У роумінгу може стягуватися додаткова плата" + "Телефон, що використовується як модем, не підключений до Інтернету" + "Не вдається підключити пристрої" + "Вимкнути використання телефона як модема" + "Увімкнено точку доступу або використання телефона як модема" + "У роумінгу може стягуватися додаткова плата" diff --git a/Tethering/res/values-mcc310-mnc004-ur/strings.xml b/Tethering/res/values-mcc310-mnc004-ur/strings.xml index d820eee8ba..90eadeff6f 100644 --- a/Tethering/res/values-mcc310-mnc004-ur/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-ur/strings.xml @@ -16,9 +16,9 @@ - "ٹیدرنگ میں انٹرنیٹ نہیں ہے" - "آلات منسلک نہیں ہو سکتے" - "ٹیدرنگ آف کریں" - "ہاٹ اسپاٹ یا ٹیدرنگ آن ہے" - "رومنگ کے دوران اضافی چارجز لاگو ہو سکتے ہیں" + "ٹیدرنگ میں انٹرنیٹ نہیں ہے" + "آلات منسلک نہیں ہو سکتے" + "ٹیدرنگ آف کریں" + "ہاٹ اسپاٹ یا ٹیدرنگ آن ہے" + "رومنگ کے دوران اضافی چارجز لاگو ہو سکتے ہیں" diff --git a/Tethering/res/values-mcc310-mnc004-uz/strings.xml b/Tethering/res/values-mcc310-mnc004-uz/strings.xml index 726148aaee..f647572396 100644 --- a/Tethering/res/values-mcc310-mnc004-uz/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-uz/strings.xml @@ -16,9 +16,9 @@ - "Modem internetga ulanmagan" - "Qurilmalar ulanmadi" - "Modem rejimini faolsizlantirish" - "Hotspot yoki modem rejimi yoniq" - "Rouming vaqtida qoʻshimcha haq olinishi mumkin" + "Modem internetga ulanmagan" + "Qurilmalar ulanmadi" + "Modem rejimini faolsizlantirish" + "Hotspot yoki modem rejimi yoniq" + "Rouming vaqtida qoʻshimcha haq olinishi mumkin" diff --git a/Tethering/res/values-mcc310-mnc004-vi/strings.xml b/Tethering/res/values-mcc310-mnc004-vi/strings.xml index b7cb0456b6..71db045ad6 100644 --- a/Tethering/res/values-mcc310-mnc004-vi/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-vi/strings.xml @@ -16,9 +16,9 @@ - "Không có Internet để chia sẻ kết Internet" - "Các thiết bị không thể kết nối" - "Tắt tính năng chia sẻ Internet" - "Điểm phát sóng hoặc tính năng chia sẻ Internet đang bật" - "Bạn có thể mất thêm phí dữ liệu khi chuyển vùng" + "Không có Internet để chia sẻ Internet" + "Các thiết bị không thể kết nối" + "Tắt tính năng chia sẻ Internet" + "Điểm phát sóng hoặc tính năng chia sẻ Internet đang bật" + "Bạn có thể mất thêm phí dữ liệu khi chuyển vùng" diff --git a/Tethering/res/values-mcc310-mnc004-zh-rCN/strings.xml b/Tethering/res/values-mcc310-mnc004-zh-rCN/strings.xml index af91afff9a..d279fddbc5 100644 --- a/Tethering/res/values-mcc310-mnc004-zh-rCN/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-zh-rCN/strings.xml @@ -16,9 +16,9 @@ - "共享网络未连接到互联网" - "设备无法连接" - "关闭网络共享" - "热点或网络共享已开启" - "漫游时可能会产生额外的费用" + "共享网络未连接到互联网" + "设备无法连接" + "关闭网络共享" + "热点或网络共享已开启" + "漫游时可能会产生额外的费用" diff --git a/Tethering/res/values-mcc310-mnc004-zh-rHK/strings.xml b/Tethering/res/values-mcc310-mnc004-zh-rHK/strings.xml index 28e6b80c01..5bad7e459e 100644 --- a/Tethering/res/values-mcc310-mnc004-zh-rHK/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-zh-rHK/strings.xml @@ -16,9 +16,9 @@ - "無法透過網絡共享連線至互聯網" - "裝置無法連接" - "關閉網絡共享" - "熱點或網絡共享已開啟" - "漫遊時可能需要支付額外費用" + "無法透過網絡共享連線至互聯網" + "裝置無法連接" + "關閉網絡共享" + "熱點或網絡共享已開啟" + "漫遊時可能需要支付額外費用" diff --git a/Tethering/res/values-mcc310-mnc004-zh-rTW/strings.xml b/Tethering/res/values-mcc310-mnc004-zh-rTW/strings.xml index 528a1e5292..8991ff43cf 100644 --- a/Tethering/res/values-mcc310-mnc004-zh-rTW/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-zh-rTW/strings.xml @@ -16,9 +16,9 @@ - "無法透過網路共用連上網際網路" - "裝置無法連線" - "關閉網路共用" - "無線基地台或網路共用已開啟" - "使用漫遊服務可能須支付額外費用" + "無法透過網路共用連上網際網路" + "裝置無法連線" + "關閉網路共用" + "無線基地台或網路共用已開啟" + "使用漫遊服務可能須支付額外費用" diff --git a/Tethering/res/values-mcc310-mnc004-zu/strings.xml b/Tethering/res/values-mcc310-mnc004-zu/strings.xml index 11eb666219..31db66aeb4 100644 --- a/Tethering/res/values-mcc310-mnc004-zu/strings.xml +++ b/Tethering/res/values-mcc310-mnc004-zu/strings.xml @@ -16,9 +16,9 @@ - "Ukusebenzisa ifoni njengemodemu akunayo i-inthanethi" - "Amadivayisi awakwazi ukuxhumeka" - "Vala ukusebenzisa ifoni njengemodemu" - "I-hotspot noma ukusebenzisa ifoni njengemodemu kuvuliwe" - "Kungaba nezinkokhelo ezengeziwe uma uzula" + "Ukusebenzisa ifoni njengemodemu akunayo i-inthanethi" + "Amadivayisi awakwazi ukuxhuma" + "Vala ukusebenzisa ifoni njengemodemu" + "I-hotspot noma ukusebenzisa ifoni njengemodemu kuvuliwe" + "Kungaba nezinkokhelo ezengeziwe uma uzula" diff --git a/Tethering/res/values-mcc311-mnc480-af/strings.xml b/Tethering/res/values-mcc311-mnc480-af/strings.xml index 9bfa5317a9..cc70b66d24 100644 --- a/Tethering/res/values-mcc311-mnc480-af/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-af/strings.xml @@ -16,9 +16,9 @@ - "Verbinding het nie internet nie" - "Toestelle kan nie koppel nie" - "Skakel verbinding af" - "Warmkol of verbinding is aan" - "Bykomende heffings kan geld terwyl jy swerf" + "Verbinding het nie internet nie" + "Toestelle kan nie koppel nie" + "Skakel verbinding af" + "Warmkol of verbinding is aan" + "Bykomende heffings kan geld terwyl jy swerf" diff --git a/Tethering/res/values-mcc311-mnc480-am/strings.xml b/Tethering/res/values-mcc311-mnc480-am/strings.xml index 5949dfa776..9808534d17 100644 --- a/Tethering/res/values-mcc311-mnc480-am/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-am/strings.xml @@ -16,9 +16,9 @@ - "ማስተሳሰር ምንም በይነመረብ የለውም" - "መሣሪያዎችን ማገናኘት አይቻልም" - "ማስተሳሰርን አጥፋ" - "መገናኛ ነጥብ ወይም ማስተሳሰር በርቷል" - "በሚያንዣብብበት ጊዜ ተጨማሪ ክፍያዎች ተፈጻሚ ሊሆኑ ይችላሉ" + "እንደ ሞደም መሰካት ምንም በይነመረብ የለውም" + "መሣሪያዎችን ማገናኘት አልተቻልም" + "እንደ ሞደም መሰካትን አጥፋ" + "መገናኛ ነጥብ ወይም እንደ ሞደም መሰካት በርቷል" + "በሚያንዣብብበት ጊዜ ተጨማሪ ክፍያዎች ተፈጻሚ ሊሆኑ ይችላሉ" diff --git a/Tethering/res/values-mcc311-mnc480-ar/strings.xml b/Tethering/res/values-mcc311-mnc480-ar/strings.xml index 8467f9b1f5..ab84c4aa3e 100644 --- a/Tethering/res/values-mcc311-mnc480-ar/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-ar/strings.xml @@ -16,9 +16,9 @@ - "ما مِن اتصال بالإنترنت خلال التوصيل" - "تعذّر اتصال الأجهزة" - "إيقاف التوصيل" - "نقطة الاتصال أو التوصيل مفعّلان" - "قد يتم تطبيق رسوم إضافية أثناء التجوال." + "ما مِن اتصال بالإنترنت خلال التوصيل" + "يتعذّر اتصال الأجهزة" + "إيقاف التوصيل" + "نقطة الاتصال مفعَّلة أو التوصيل مفعَّل" + "قد يتم تحصيل رسوم إضافية أثناء التجوال." diff --git a/Tethering/res/values-mcc311-mnc480-as/strings.xml b/Tethering/res/values-mcc311-mnc480-as/strings.xml index 9776bd89da..f7ab7e9345 100644 --- a/Tethering/res/values-mcc311-mnc480-as/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-as/strings.xml @@ -16,9 +16,9 @@ - "টে\'ডাৰিঙৰ ইণ্টাৰনেট নাই" - "ডিভাইচসমূহ সংযোগ কৰিব নোৱাৰি" - "টে\'ডাৰিং অফ কৰক" - "হটস্পট অথবা টে\'ডাৰিং অন আছে" - "ৰ\'মিঙত থাকিলে অতিৰিক্ত মাচুল প্ৰযোজ্য হ’ব পাৰে" + "টে’ডাৰিঙৰ ইণ্টাৰনেট নাই" + "ডিভাইচসমূহ সংযোগ কৰিব নোৱাৰি" + "টে’ডাৰিং অফ কৰক" + "হ’টস্প’ট অথবা টে’ডাৰিং অন আছে" + "ৰ’মিঙত থাকিলে অতিৰিক্ত মাচুল প্ৰযোজ্য হ’ব পাৰে" diff --git a/Tethering/res/values-mcc311-mnc480-az/strings.xml b/Tethering/res/values-mcc311-mnc480-az/strings.xml index e6d3eaf9f0..6e36df1719 100644 --- a/Tethering/res/values-mcc311-mnc480-az/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-az/strings.xml @@ -16,9 +16,9 @@ - "Modemin internetə girişi yoxdur" - "Cihazları qoşmaq mümkün deyil" - "Modemi deaktiv edin" - "Hotspot və ya modem aktivdir" - "Rouminq zamanı əlavə ödənişlər tətbiq edilə bilər" + "Modem rejimi internetə qoşulmayıb" + "Cihazları qoşmaq olmur" + "Modem rejimini deaktiv edin" + "Hotspot və ya modem rejimi aktivdir" + "Rouminq zamanı əlavə ödəniş çıxıla bilər" diff --git a/Tethering/res/values-mcc311-mnc480-b+sr+Latn/strings.xml b/Tethering/res/values-mcc311-mnc480-b+sr+Latn/strings.xml index 4c8a1df8ee..173007554b 100644 --- a/Tethering/res/values-mcc311-mnc480-b+sr+Latn/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-b+sr+Latn/strings.xml @@ -16,9 +16,9 @@ - "Privezivanje nema pristup internetu" - "Povezivanje uređaja nije uspelo" - "Isključi privezivanje" - "Uključen je hotspot ili privezivanje" - "Možda važe dodatni troškovi u romingu" + "Privezivanje nema pristup internetu" + "Povezivanje uređaja nije uspelo" + "Isključi privezivanje" + "Uključen je hotspot ili privezivanje" + "Možda važe dodatni troškovi u romingu" diff --git a/Tethering/res/values-mcc311-mnc480-be/strings.xml b/Tethering/res/values-mcc311-mnc480-be/strings.xml index edfa41e1ff..88577d4121 100644 --- a/Tethering/res/values-mcc311-mnc480-be/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-be/strings.xml @@ -16,9 +16,9 @@ - "Рэжым мадэма выкарыстоўваецца без доступу да інтэрнэту" - "Не ўдалося падключыць прылады" - "Выключыць рэжым мадэма" - "Хот-спот або рэжым мадэма ўключаны" - "Пры выкарыстанні роўмінгу можа спаганяцца дадатковая плата" + "Рэжым мадэма выкарыстоўваецца без доступу да інтэрнэту" + "Не ўдалося падключыць прылады" + "Выключыць рэжым мадэма" + "Хот-спот або рэжым мадэма ўключаны" + "Пры выкарыстанні роўмінгу можа спаганяцца дадатковая плата" diff --git a/Tethering/res/values-mcc311-mnc480-bg/strings.xml b/Tethering/res/values-mcc311-mnc480-bg/strings.xml index f56398196f..d549997b0f 100644 --- a/Tethering/res/values-mcc311-mnc480-bg/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-bg/strings.xml @@ -16,9 +16,9 @@ - "Тетърингът няма връзка с интернет" - "Устройствата не могат да установят връзка" - "Изключване на тетъринга" - "Точката за достъп или тетърингът са включени" - "Възможно е да ви бъдат начислени допълнителни такси при роуминг" + "Няма връзка с интернет за тетъринг" + "Устройствата не могат да установят връзка" + "Изключване на функцията за тетъринг" + "Точката за достъп или функцията за тетъринг са включени" + "Възможно е да ви бъдат начислени допълнителни такси при роуминг" diff --git a/Tethering/res/values-mcc311-mnc480-bn/strings.xml b/Tethering/res/values-mcc311-mnc480-bn/strings.xml index d8ecd2e988..93e316a947 100644 --- a/Tethering/res/values-mcc311-mnc480-bn/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-bn/strings.xml @@ -16,9 +16,9 @@ - "টিথারিং করার জন্য কোনও ইন্টারনেট কানেকশন নেই" - "ডিভাইস কানেক্ট করতে পারছে না" - "টিথারিং বন্ধ করুন" - "হটস্পট বা টিথারিং চালু আছে" - "রোমিংয়ের সময় অতিরিক্ত চার্জ করা হতে পারে" + "টেথারিং করার জন্য কোনও ইন্টারনেট কানেকশন লাগে না" + "ডিভাইস কানেক্ট করা যাচ্ছে না" + "টেথারিং বন্ধ করুন" + "হটস্পট বা টেথারিং চালু আছে" + "রোমিংয়ে থাকার সময় অতিরিক্ত চার্জ লাগতে পারে" diff --git a/Tethering/res/values-mcc311-mnc480-bs/strings.xml b/Tethering/res/values-mcc311-mnc480-bs/strings.xml index b85fd5e285..27777c266a 100644 --- a/Tethering/res/values-mcc311-mnc480-bs/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-bs/strings.xml @@ -16,9 +16,9 @@ - "Povezivanje putem mobitela nema internet" - "Uređaji se ne mogu povezati" - "Isključi povezivanje putem mobitela" - "Pristupna tačka ili povezivanje putem mobitela je uključeno" - "Mogu nastati dodatni troškovi u romingu" + "Dijeljenje internetske veze nema internet" + "Nije moguće povezati uređaje" + "Isključi dijeljenje internetske veze" + "Pristupna tačka ili dijeljenje internetske veze su uključeni" + "Mogu nastati dodatni troškovi u romingu" diff --git a/Tethering/res/values-mcc311-mnc480-ca/strings.xml b/Tethering/res/values-mcc311-mnc480-ca/strings.xml index a3572151be..dad35f884c 100644 --- a/Tethering/res/values-mcc311-mnc480-ca/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-ca/strings.xml @@ -16,9 +16,9 @@ - "La compartició de xarxa no té accés a Internet" - "No es poden connectar els dispositius" - "Desactiva la compartició de xarxa" - "S\'ha activat el punt d\'accés Wi‑Fi o la compartició de xarxa" - "És possible que s\'apliquin costos addicionals en itinerància" + "La compartició de xarxa no té accés a Internet" + "No es poden connectar els dispositius" + "Desactiva la compartició de xarxa" + "El punt d\'accés Wi‑Fi o la compartició de xarxa estan activats" + "És possible que s\'apliquin costos addicionals en itinerància" diff --git a/Tethering/res/values-mcc311-mnc480-cs/strings.xml b/Tethering/res/values-mcc311-mnc480-cs/strings.xml index 91196be9e5..cbcabe1043 100644 --- a/Tethering/res/values-mcc311-mnc480-cs/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-cs/strings.xml @@ -16,9 +16,9 @@ - "Tethering nemá připojení k internetu" - "Zařízení se nemůžou připojit" - "Vypnout tethering" - "Je zapnutý hotspot nebo tethering" - "Při roamingu mohou být účtovány dodatečné poplatky" + "Tethering nemá připojení k internetu" + "Zařízení se nemůžou připojit" + "Vypnout tethering" + "Je zapnutý hotspot nebo tethering" + "Při roamingu mohou být účtovány dodatečné poplatky" diff --git a/Tethering/res/values-mcc311-mnc480-da/strings.xml b/Tethering/res/values-mcc311-mnc480-da/strings.xml index 196890011d..917670965c 100644 --- a/Tethering/res/values-mcc311-mnc480-da/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-da/strings.xml @@ -16,9 +16,9 @@ - "Netdeling har ingen internetforbindelse" - "Enheder kan ikke oprette forbindelse" - "Deaktiver netdeling" - "Hotspot eller netdeling er aktiveret" - "Der opkræves muligvis yderligere gebyrer ved roaming" + "Netdeling har ingen internetforbindelse" + "Enheder kan ikke oprette forbindelse" + "Deaktiver netdeling" + "Hotspot eller netdeling er aktiveret" + "Der opkræves muligvis yderligere gebyrer ved roaming" diff --git a/Tethering/res/values-mcc311-mnc480-de/strings.xml b/Tethering/res/values-mcc311-mnc480-de/strings.xml index eb3f8c52c0..b3bc7d83d8 100644 --- a/Tethering/res/values-mcc311-mnc480-de/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-de/strings.xml @@ -16,9 +16,9 @@ - "Tethering hat keinen Internetzugriff" - "Geräte können sich nicht verbinden" - "Tethering deaktivieren" - "Hotspot oder Tethering ist aktiviert" - "Für das Roaming können zusätzliche Gebühren anfallen" + "Tethering hat keinen Internetzugriff" + "Geräte können sich nicht verbinden" + "Tethering deaktivieren" + "Hotspot oder Tethering ist aktiviert" + "Für das Roaming können zusätzliche Gebühren anfallen" diff --git a/Tethering/res/values-mcc311-mnc480-el/strings.xml b/Tethering/res/values-mcc311-mnc480-el/strings.xml index 56c3d81b63..babd62ce91 100644 --- a/Tethering/res/values-mcc311-mnc480-el/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-el/strings.xml @@ -16,9 +16,9 @@ - "Η σύνδεση δεν έχει πρόσβαση στο διαδίκτυο" - "Δεν είναι δυνατή η σύνδεση των συσκευών" - "Απενεργοποιήστε τη σύνδεση" - "Ενεργό σημείο πρόσβασης Wi-Fi ή ενεργή σύνδεση" - "Ενδέχεται να ισχύουν επιπλέον χρεώσεις κατά την περιαγωγή." + "Η σύνδεση δεν έχει πρόσβαση στο διαδίκτυο" + "Δεν είναι δυνατή η σύνδεση των συσκευών" + "Απενεργοποίηση σύνδεσης" + "Ενεργό σημείο πρόσβασης Wi-Fi ή ενεργή σύνδεση" + "Ενδέχεται να ισχύουν επιπλέον χρεώσεις κατά την περιαγωγή." diff --git a/Tethering/res/values-mcc311-mnc480-en-rAU/strings.xml b/Tethering/res/values-mcc311-mnc480-en-rAU/strings.xml index dd1a1971cd..afa4467a0f 100644 --- a/Tethering/res/values-mcc311-mnc480-en-rAU/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-en-rAU/strings.xml @@ -16,9 +16,9 @@ - "Tethering has no Internet" - "Devices can’t connect" - "Turn off tethering" - "Hotspot or tethering is on" - "Additional charges may apply while roaming" + "Tethering has no Internet" + "Devices can\'t connect" + "Turn off tethering" + "Hotspot or tethering is on" + "Additional charges may apply while roaming" diff --git a/Tethering/res/values-mcc311-mnc480-en-rCA/strings.xml b/Tethering/res/values-mcc311-mnc480-en-rCA/strings.xml index dd1a1971cd..251cad6339 100644 --- a/Tethering/res/values-mcc311-mnc480-en-rCA/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-en-rCA/strings.xml @@ -16,9 +16,9 @@ - "Tethering has no Internet" - "Devices can’t connect" - "Turn off tethering" - "Hotspot or tethering is on" - "Additional charges may apply while roaming" + "Tethering has no internet" + "Devices can’t connect" + "Turn off tethering" + "Hotspot or tethering is on" + "Additional charges may apply while roaming" diff --git a/Tethering/res/values-mcc311-mnc480-en-rGB/strings.xml b/Tethering/res/values-mcc311-mnc480-en-rGB/strings.xml index dd1a1971cd..afa4467a0f 100644 --- a/Tethering/res/values-mcc311-mnc480-en-rGB/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-en-rGB/strings.xml @@ -16,9 +16,9 @@ - "Tethering has no Internet" - "Devices can’t connect" - "Turn off tethering" - "Hotspot or tethering is on" - "Additional charges may apply while roaming" + "Tethering has no Internet" + "Devices can\'t connect" + "Turn off tethering" + "Hotspot or tethering is on" + "Additional charges may apply while roaming" diff --git a/Tethering/res/values-mcc311-mnc480-en-rIN/strings.xml b/Tethering/res/values-mcc311-mnc480-en-rIN/strings.xml index dd1a1971cd..afa4467a0f 100644 --- a/Tethering/res/values-mcc311-mnc480-en-rIN/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-en-rIN/strings.xml @@ -16,9 +16,9 @@ - "Tethering has no Internet" - "Devices can’t connect" - "Turn off tethering" - "Hotspot or tethering is on" - "Additional charges may apply while roaming" + "Tethering has no Internet" + "Devices can\'t connect" + "Turn off tethering" + "Hotspot or tethering is on" + "Additional charges may apply while roaming" diff --git a/Tethering/res/values-mcc311-mnc480-en-rXC/strings.xml b/Tethering/res/values-mcc311-mnc480-en-rXC/strings.xml index d3347aae20..766a0e8950 100644 --- a/Tethering/res/values-mcc311-mnc480-en-rXC/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-en-rXC/strings.xml @@ -16,9 +16,9 @@ - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎Tethering has no internet‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎Devices can’t connect‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎Turn off tethering‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎Hotspot or tethering is on‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‏‎Additional charges may apply while roaming‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‎‎Tethering has no internet‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‎‏‎‎Devices can’t connect‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‎‎‎Turn off tethering‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎Hotspot or tethering is on‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎Additional charges may apply while roaming‎‏‎‎‏‎" diff --git a/Tethering/res/values-mcc311-mnc480-es-rUS/strings.xml b/Tethering/res/values-mcc311-mnc480-es-rUS/strings.xml index 2f0504f07d..16c6059aa2 100644 --- a/Tethering/res/values-mcc311-mnc480-es-rUS/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-es-rUS/strings.xml @@ -16,9 +16,9 @@ - "La conexión mediante dispositivo móvil no tiene Internet" - "No se pueden conectar los dispositivos" - "Desactivar conexión mediante dispositivo móvil" - "Se activó el hotspot o la conexión mediante dispositivo móvil" - "Es posible que se apliquen cargos adicionales por roaming" + "La conexión mediante dispositivo móvil no tiene Internet" + "No se pueden conectar los dispositivos" + "Desactivar conexión mediante dispositivo móvil" + "Se activó el hotspot o la conexión mediante dispositivo móvil" + "Es posible que se apliquen cargos adicionales por roaming" diff --git a/Tethering/res/values-mcc311-mnc480-es/strings.xml b/Tethering/res/values-mcc311-mnc480-es/strings.xml index 2d8f882425..952e0562fa 100644 --- a/Tethering/res/values-mcc311-mnc480-es/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-es/strings.xml @@ -16,9 +16,9 @@ - "La conexión no se puede compartir, porque no hay acceso a Internet" - "Los dispositivos no se pueden conectar" - "Desactivar conexión compartida" - "Punto de acceso o conexión compartida activados" - "Puede que se apliquen cargos adicionales en itinerancia" + "La conexión no se puede compartir, porque no hay acceso a Internet" + "Los dispositivos no se pueden conectar" + "Desactivar conexión compartida" + "Punto de acceso o conexión compartida activados" + "Pueden aplicarse cargos adicionales en roaming" diff --git a/Tethering/res/values-mcc311-mnc480-et/strings.xml b/Tethering/res/values-mcc311-mnc480-et/strings.xml index 8493c47071..c9cae1f4db 100644 --- a/Tethering/res/values-mcc311-mnc480-et/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-et/strings.xml @@ -16,9 +16,9 @@ - "Jagamisel puudub internetiühendus" - "Seadmed ei saa ühendust luua" - "Lülita jagamine välja" - "Kuumkoht või jagamine on sisse lülitatud" - "Rändluse kasutamisega võivad kaasneda lisatasud" + "Jagamisel puudub internetiühendus" + "Seadmed ei saa ühendust luua" + "Lülita jagamine välja" + "Kuumkoht või jagamine on sisse lülitatud" + "Rändluse kasutamisega võivad kaasneda lisatasud" diff --git a/Tethering/res/values-mcc311-mnc480-eu/strings.xml b/Tethering/res/values-mcc311-mnc480-eu/strings.xml index 33bccab3e8..7abb4b0404 100644 --- a/Tethering/res/values-mcc311-mnc480-eu/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-eu/strings.xml @@ -16,9 +16,9 @@ - "Konexioa partekatzeko aukerak ez du Interneteko konexiorik" - "Ezin dira konektatu gailuak" - "Desaktibatu konexioa partekatzeko aukera" - "Wifi-gunea edo konexioa partekatzeko aukera aktibatuta dago" - "Baliteke kostu gehigarriak ordaindu behar izatea ibiltaritzan" + "Konexioa partekatzeko aukerak ez du Interneteko konexiorik" + "Ezin dira konektatu gailuak" + "Desaktibatu konexioa partekatzeko aukera" + "Wifi-gunea edo konexioa partekatzeko aukera aktibatuta dago" + "Baliteke tarifa gehigarriak ordaindu behar izatea ibiltaritza erabili bitartean" diff --git a/Tethering/res/values-mcc311-mnc480-fa/strings.xml b/Tethering/res/values-mcc311-mnc480-fa/strings.xml index cf8a0cc277..6bdf38743f 100644 --- a/Tethering/res/values-mcc311-mnc480-fa/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-fa/strings.xml @@ -16,9 +16,9 @@ - "«اشتراک‌گذاری اینترنت» به اینترنت دسترسی ندارد" - "دستگاه‌ها متصل نمی‌شوند" - "خاموش کردن «اشتراک‌گذاری اینترنت»" - "«نقطه اتصال» یا «اشتراک‌گذاری اینترنت» روشن است" - "ممکن است درحین فراگردی تغییرات دیگر اعمال شود" + "«اشتراک‌گذاری اینترنت» به اینترنت دسترسی ندارد" + "دستگاه‌ها متصل نمی‌شوند" + "خاموش کردن «اشتراک‌گذاری اینترنت»" + "«نقطه اتصال» یا «اشتراک‌گذاری اینترنت» روشن است" + "هنگام فراگردی ممکن است هزینه‌های اضافی کسر شود" diff --git a/Tethering/res/values-mcc311-mnc480-fi/strings.xml b/Tethering/res/values-mcc311-mnc480-fi/strings.xml index 6a3ab806db..57f16bb52c 100644 --- a/Tethering/res/values-mcc311-mnc480-fi/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-fi/strings.xml @@ -16,9 +16,9 @@ - "Ei jaettavaa internetyhteyttä" - "Laitteet eivät voi muodostaa yhteyttä" - "Laita yhteyden jakaminen pois päältä" - "Hotspot tai yhteyden jakaminen on päällä" - "Roaming voi aiheuttaa lisämaksuja" + "Puhelinta ei voi käyttää modeemina, koska sillä ei ole internet-yhteyttä" + "Laitteet eivät voi muodostaa yhteyttä" + "Laita puhelimen käyttäminen modeemina pois päältä" + "Hotspot tai puhelimen käyttäminen modeemina on päällä" + "Roaming voi aiheuttaa lisämaksuja" diff --git a/Tethering/res/values-mcc311-mnc480-fr-rCA/strings.xml b/Tethering/res/values-mcc311-mnc480-fr-rCA/strings.xml index ffb9bf6047..bf3d634c8b 100644 --- a/Tethering/res/values-mcc311-mnc480-fr-rCA/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-fr-rCA/strings.xml @@ -16,9 +16,9 @@ - "Le partage de connexion n\'est pas connecté à Internet" - "Impossible de connecter les appareils" - "Désactiver le partage de connexion" - "Le point d\'accès ou le partage de connexion est activé" - "En itinérance, des frais supplémentaires peuvent s\'appliquer" + "Le partage de connexion n\'est pas connecté à Internet" + "Impossible de connecter les appareils" + "Désactiver le partage de connexion" + "Le point d\'accès sans fil ou le partage de connexion est activé" + "En itinérance, des frais supplémentaires peuvent s\'appliquer" diff --git a/Tethering/res/values-mcc311-mnc480-fr/strings.xml b/Tethering/res/values-mcc311-mnc480-fr/strings.xml index 768bce3f0a..6faa61e96b 100644 --- a/Tethering/res/values-mcc311-mnc480-fr/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-fr/strings.xml @@ -16,9 +16,9 @@ - "Aucune connexion à Internet n\'est disponible pour le partage de connexion" - "Impossible de connecter les appareils" - "Désactiver le partage de connexion" - "Le point d\'accès ou le partage de connexion est activé" - "En itinérance, des frais supplémentaires peuvent s\'appliquer" + "Aucune connexion à Internet disponible pour le partage de connexion" + "Impossible de connecter les appareils" + "Désactiver le partage de connexion" + "Le point d\'accès ou le partage de connexion est activé" + "En itinérance, des frais supplémentaires peuvent s\'appliquer" diff --git a/Tethering/res/values-mcc311-mnc480-gl/strings.xml b/Tethering/res/values-mcc311-mnc480-gl/strings.xml index 0c4195a7ca..446d706cec 100644 --- a/Tethering/res/values-mcc311-mnc480-gl/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-gl/strings.xml @@ -16,9 +16,9 @@ - "A conexión compartida non ten Internet" - "Non se puideron conectar os dispositivos" - "Desactivar conexión compartida" - "Está activada a zona wifi ou a conexión compartida" - "Pódense aplicar cargos adicionais en itinerancia" + "A conexión compartida non ten acceso a Internet" + "Non se puideron conectar os dispositivos" + "Desactivar conexión compartida" + "Está activada a zona wifi ou a conexión compartida" + "Pódense aplicar cargos adicionais en itinerancia" diff --git a/Tethering/res/values-mcc311-mnc480-gu/strings.xml b/Tethering/res/values-mcc311-mnc480-gu/strings.xml index e9d33a7db2..577874d202 100644 --- a/Tethering/res/values-mcc311-mnc480-gu/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-gu/strings.xml @@ -16,9 +16,9 @@ - "ઇન્ટરનેટ શેર કરવાની સુવિધામાં ઇન્ટરનેટ નથી" - "ડિવાઇસ કનેક્ટ કરી શકાતા નથી" - "ઇન્ટરનેટ શેર કરવાની સુવિધા બંધ કરો" - "હૉટસ્પૉટ અથવા ઇન્ટરનેટ શેર કરવાની સુવિધા ચાલુ છે" - "રોમિંગમાં વધારાના શુલ્ક લાગી શકે છે" + "ઇન્ટરનેટ શેર કરવાની સુવિધામાં ઇન્ટરનેટ નથી" + "ડિવાઇસ કનેક્ટ કરી શકાતા નથી" + "ઇન્ટરનેટ શેર કરવાની સુવિધા બંધ કરો" + "હૉટસ્પૉટ અથવા ઇન્ટરનેટ શેર કરવાની સુવિધા ચાલુ છે" + "રોમિંગ દરમિયાન વધારાના શુલ્ક લાગુ થઈ શકે છે" diff --git a/Tethering/res/values-mcc311-mnc480-hi/strings.xml b/Tethering/res/values-mcc311-mnc480-hi/strings.xml index aa418ac5d3..f2a477378d 100644 --- a/Tethering/res/values-mcc311-mnc480-hi/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-hi/strings.xml @@ -16,9 +16,9 @@ - "टेदरिंग से इंटरनेट नहीं चल रहा" - "डिवाइस कनेक्ट नहीं हो पा रहे" - "टेदरिंग बंद करें" - "हॉटस्पॉट या टेदरिंग चालू है" - "रोमिंग के दौरान अतिरिक्त शुल्क लग सकता है" + "टेदरिंग से इंटरनेट नहीं चल रहा है" + "डिवाइस कनेक्ट नहीं हो पा रहे" + "टेदरिंग बंद करें" + "हॉटस्पॉट या टेदरिंग चालू है" + "रोमिंग के दौरान अतिरिक्त शुल्क काटा जा सकता है" diff --git a/Tethering/res/values-mcc311-mnc480-hr/strings.xml b/Tethering/res/values-mcc311-mnc480-hr/strings.xml index 51c524afbc..a08f8220db 100644 --- a/Tethering/res/values-mcc311-mnc480-hr/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-hr/strings.xml @@ -16,9 +16,9 @@ - "Modemsko povezivanje nema internet" - "Uređaji se ne mogu povezati" - "Isključivanje modemskog povezivanja" - "Uključena je žarišna točka ili modemsko povezivanje" - "U roamingu su mogući dodatni troškovi" + "Modemsko povezivanje nema internet" + "Uređaji se ne mogu povezati" + "Isključi modemsko povezivanje" + "Uključena je žarišna točka ili modemsko povezivanje" + "U roamingu su mogući dodatni troškovi" diff --git a/Tethering/res/values-mcc311-mnc480-hu/strings.xml b/Tethering/res/values-mcc311-mnc480-hu/strings.xml index 164e45edd1..61a399a9cb 100644 --- a/Tethering/res/values-mcc311-mnc480-hu/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-hu/strings.xml @@ -16,9 +16,9 @@ - "Nincs internetkapcsolat az internet megosztásához" - "Az eszközök nem tudnak csatlakozni" - "Internetmegosztás kikapcsolása" - "A hotspot vagy az internetmegosztás be van kapcsolva" - "Roaming során további díjak léphetnek fel" + "Nincs internetkapcsolat az internet megosztásához" + "Az eszközök nem tudnak csatlakozni" + "Internetmegosztás kikapcsolása" + "A hotspot vagy az internetmegosztás be van kapcsolva" + "Roaming során további díjak léphetnek fel" diff --git a/Tethering/res/values-mcc311-mnc480-hy/strings.xml b/Tethering/res/values-mcc311-mnc480-hy/strings.xml index e76c0a4c80..f4d63c9a6b 100644 --- a/Tethering/res/values-mcc311-mnc480-hy/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-hy/strings.xml @@ -16,9 +16,9 @@ - "Մոդեմի ռեժիմի կապը բացակայում է" - "Չհաջողվեց միացնել սարքը" - "Անջատել մոդեմի ռեժիմը" - "Թեժ կետը կամ մոդեմի ռեժիմը միացված է" - "Ռոումինգում կարող են լրացուցիչ վճարներ գանձվել" + "Մոդեմի ռեժիմի ինտերնետ կապը բացակայում է" + "Չհաջողվեց միացնել սարքերը" + "Անջատել մոդեմի ռեժիմը" + "Թեժ կետը կամ մոդեմի ռեժիմը միացված է" + "Ռոումինգում կարող են լրացուցիչ վճարներ գանձվել" diff --git a/Tethering/res/values-mcc311-mnc480-in/strings.xml b/Tethering/res/values-mcc311-mnc480-in/strings.xml index 2b817f8abd..98c6d71872 100644 --- a/Tethering/res/values-mcc311-mnc480-in/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-in/strings.xml @@ -16,9 +16,9 @@ - "Tidak ada koneksi internet di tethering" - "Perangkat tidak dapat terhubung" - "Nonaktifkan tethering" - "Hotspot atau tethering aktif" - "Biaya tambahan mungkin berlaku saat roaming" + "Tidak ada koneksi internet di tethering" + "Perangkat tidak dapat terhubung" + "Nonaktifkan tethering" + "Hotspot atau tethering aktif" + "Biaya tambahan mungkin berlaku saat roaming" diff --git a/Tethering/res/values-mcc311-mnc480-is/strings.xml b/Tethering/res/values-mcc311-mnc480-is/strings.xml index a338d9c7ca..ade1b0110b 100644 --- a/Tethering/res/values-mcc311-mnc480-is/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-is/strings.xml @@ -16,9 +16,9 @@ - "Tjóðrun er ekki með internettengingu" - "Tæki geta ekki tengst" - "Slökkva á tjóðrun" - "Kveikt er á heitum reit eða tjóðrun" - "Viðbótargjöld kunna að eiga við í reiki" + "Tjóðrun er ekki með internettengingu" + "Tæki geta ekki tengst" + "Slökkva á tjóðrun" + "Kveikt er á heitum reit eða tjóðrun" + "Viðbótargjöld kunna að eiga við í reiki" diff --git a/Tethering/res/values-mcc311-mnc480-it/strings.xml b/Tethering/res/values-mcc311-mnc480-it/strings.xml index 77769c2ac5..07e1526409 100644 --- a/Tethering/res/values-mcc311-mnc480-it/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-it/strings.xml @@ -16,9 +16,9 @@ - "Nessuna connessione a Internet per il tethering" - "Impossibile connettere i dispositivi" - "Disattiva il tethering" - "Hotspot o tethering attivi" - "Potrebbero essere applicati costi aggiuntivi durante il roaming" + "Nessuna connessione a internet per il tethering" + "Impossibile connettere i dispositivi" + "Disattiva il tethering" + "Hotspot o tethering attivo" + "Potrebbero essere applicati costi aggiuntivi durante il roaming" diff --git a/Tethering/res/values-mcc311-mnc480-iw/strings.xml b/Tethering/res/values-mcc311-mnc480-iw/strings.xml index 5267b51264..ebebae8faf 100644 --- a/Tethering/res/values-mcc311-mnc480-iw/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-iw/strings.xml @@ -16,9 +16,9 @@ - "אי אפשר להפעיל את תכונת שיתוף האינטרנט בין מכשירים כי אין חיבור לאינטרנט" - "למכשירים אין אפשרות להתחבר" - "השבתה של שיתוף האינטרנט בין מכשירים" - "תכונת הנקודה לשיתוף אינטרנט או תכונת שיתוף האינטרנט בין מכשירים פועלת" - "ייתכנו חיובים נוספים בעת נדידה" + "אי אפשר להפעיל את תכונת שיתוף האינטרנט בין מכשירים כי אין חיבור לאינטרנט" + "למכשירים אין אפשרות להתחבר" + "השבתה של שיתוף האינטרנט בין מכשירים" + "תכונת הנקודה לשיתוף אינטרנט או תכונת שיתוף האינטרנט בין מכשירים פועלת" + "ייתכנו חיובים נוספים במהלך נדידה" diff --git a/Tethering/res/values-mcc311-mnc480-ja/strings.xml b/Tethering/res/values-mcc311-mnc480-ja/strings.xml index 66a9a6dd35..334d3628a8 100644 --- a/Tethering/res/values-mcc311-mnc480-ja/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-ja/strings.xml @@ -16,9 +16,9 @@ - "テザリングがインターネットに接続されていません" - "デバイスを接続できません" - "テザリングを OFF にする" - "アクセス ポイントまたはテザリングが ON です" - "ローミング時に追加料金が発生することがあります" + "テザリングがインターネットに接続されていません" + "デバイスを接続できません" + "テザリングを OFF にする" + "アクセス ポイントまたはテザリングが ON です" + "ローミング時に追加料金が発生することがあります" diff --git a/Tethering/res/values-mcc311-mnc480-ka/strings.xml b/Tethering/res/values-mcc311-mnc480-ka/strings.xml index d8ad880849..d369d20267 100644 --- a/Tethering/res/values-mcc311-mnc480-ka/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-ka/strings.xml @@ -16,9 +16,9 @@ - "ტეტერინგს არ აქვს ინტერნეტზე წვდომა" - "მოწყობილობები ვერ ახერხებენ დაკავშირებას" - "ტეტერინგის გამორთვა" - "ჩართულია უსადენო ქსელი ან ტეტერინგი" - "როუმინგის გამოყენებისას შეიძლება ჩამოგეჭრათ დამატებითი საფასური" + "ტეტერინგს არ აქვს ინტერნეტზე წვდომა" + "მოწყობილობები ვერ ახერხებენ დაკავშირებას" + "ტეტერინგის გამორთვა" + "ჩართულია უსადენო ქსელი ან ტეტერინგი" + "როუმინგის გამოყენებისას შეიძლება ჩამოგეჭრათ დამატებითი საფასური" diff --git a/Tethering/res/values-mcc311-mnc480-kk/strings.xml b/Tethering/res/values-mcc311-mnc480-kk/strings.xml index 1ddd6b419b..c16c106162 100644 --- a/Tethering/res/values-mcc311-mnc480-kk/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-kk/strings.xml @@ -16,9 +16,9 @@ - "Тетеринг режимі интернет байланысынсыз пайдаланылуда" - "Құрылғыларды байланыстыру мүмкін емес" - "Тетерингіні өшіру" - "Хотспот немесе тетеринг қосулы" - "Роуминг кезінде қосымша ақы алынуы мүмкін." + "Тетеринг кезінде интернет байланысы жоқ" + "Құрылғыларды байланыстыру мүмкін емес" + "Тетерингіні өшіру" + "Хотспот немесе тетеринг қосулы" + "Роуминг кезінде қосымша ақы алынуы мүмкін." diff --git a/Tethering/res/values-mcc311-mnc480-km/strings.xml b/Tethering/res/values-mcc311-mnc480-km/strings.xml index cf5a1379cc..8084b877fd 100644 --- a/Tethering/res/values-mcc311-mnc480-km/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-km/strings.xml @@ -16,9 +16,9 @@ - "ការភ្ជាប់​មិនមានអ៊ីនធឺណិត​ទេ" - "មិនអាច​ភ្ជាប់ឧបករណ៍​បានទេ" - "បិទការភ្ជាប់" - "ហតស្ប៉ត ឬការភ្ជាប់​ត្រូវបានបើក" - "អាចមាន​ការគិតថ្លៃ​បន្ថែម នៅពេល​រ៉ូមីង" + "ការភ្ជាប់​មិនមានអ៊ីនធឺណិត​ទេ" + "មិនអាច​ភ្ជាប់ឧបករណ៍​បានទេ" + "បិទការភ្ជាប់" + "ហតស្ប៉ត ឬការភ្ជាប់​ត្រូវបានបើក" + "អាចមាន​ការគិតថ្លៃ​បន្ថែម នៅពេល​រ៉ូមីង" diff --git a/Tethering/res/values-mcc311-mnc480-kn/strings.xml b/Tethering/res/values-mcc311-mnc480-kn/strings.xml index 68ae68bc19..528cdbf18a 100644 --- a/Tethering/res/values-mcc311-mnc480-kn/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-kn/strings.xml @@ -16,9 +16,9 @@ - "ಟೆಥರಿಂಗ್‌ ಯಾವುದೇ ಇಂಟರ್ನೆಟ್ ಕನೆಕ್ಷನ್ ಹೊಂದಿಲ್ಲ" - "ಸಾಧನಗಳನ್ನು ಕನೆಕ್ಟ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ" - "ಟೆಥರಿಂಗ್‌ ಆಫ್ ಮಾಡಿ" - "ಹಾಟ್‌ಸ್ಪಾಟ್ ಅಥವಾ ಟೆಥರಿಂಗ್‌ ಆನ್ ಆಗಿದೆ" - "ರೋಮಿಂಗ್‌ನಲ್ಲಿರುವಾಗ ಹೆಚ್ಚುವರಿ ಶುಲ್ಕಗಳು ಅನ್ವಯವಾಗಬಹುದು" + "ಟೆಥರಿಂಗ್‌ ಯಾವುದೇ ಇಂಟರ್ನೆಟ್ ಕನೆಕ್ಷನ್ ಹೊಂದಿಲ್ಲ" + "ಸಾಧನಗಳನ್ನು ಕನೆಕ್ಟ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ" + "ಟೆಥರಿಂಗ್‌ ಆಫ್ ಮಾಡಿ" + "ಹಾಟ್‌ಸ್ಪಾಟ್ ಅಥವಾ ಟೆಥರಿಂಗ್‌ ಆನ್ ಆಗಿದೆ" + "ರೋಮಿಂಗ್‌ನಲ್ಲಿರುವಾಗ ಹೆಚ್ಚುವರಿ ಶುಲ್ಕಗಳು ಅನ್ವಯವಾಗಬಹುದು" diff --git a/Tethering/res/values-mcc311-mnc480-ko/strings.xml b/Tethering/res/values-mcc311-mnc480-ko/strings.xml index 17185ba2d0..f195c82daa 100644 --- a/Tethering/res/values-mcc311-mnc480-ko/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-ko/strings.xml @@ -16,9 +16,9 @@ - "테더링으로 인터넷을 사용할 수 없음" - "기기에서 연결할 수 없음" - "테더링 사용 중지" - "핫스팟 또는 테더링 켜짐" - "로밍 중에는 추가 요금이 발생할 수 있습니다." + "테더링으로 인터넷을 사용할 수 없음" + "기기에서 연결할 수 없음" + "테더링 사용 중지" + "핫스팟 또는 테더링이 켜짐" + "로밍 중에는 추가 요금이 부과될 수 있습니다." diff --git a/Tethering/res/values-mcc311-mnc480-ky/strings.xml b/Tethering/res/values-mcc311-mnc480-ky/strings.xml index 6a9fb9810c..f8ca53149e 100644 --- a/Tethering/res/values-mcc311-mnc480-ky/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-ky/strings.xml @@ -16,9 +16,9 @@ - "Модем режими Интернети жок колдонулууда" - "Түзмөктөр туташпай жатат" - "Модем режимин өчүрүү" - "Байланыш түйүнү же модем режими күйүк" - "Роумингде кошумча акы алынышы мүмкүн" + "Модем режими Интернети жок колдонулууда" + "Түзмөктөр туташпай жатат" + "Модем режимин өчүрүү" + "Байланыш түйүнү же модем режими күйүк" + "Роумингде кошумча акы алынышы мүмкүн" diff --git a/Tethering/res/values-mcc311-mnc480-lo/strings.xml b/Tethering/res/values-mcc311-mnc480-lo/strings.xml index bcc4b57626..6258bc0d9c 100644 --- a/Tethering/res/values-mcc311-mnc480-lo/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-lo/strings.xml @@ -16,9 +16,9 @@ - "ການປ່ອຍສັນຍານບໍ່ມີອິນເຕີເນັດ" - "ອຸປະກອນບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້" - "ປິດການປ່ອຍສັນຍານ" - "ເປີດໃຊ້ຮັອດສະປອດ ຫຼື ການປ່ອຍສັນຍານຢູ່" - "ອາດມີຄ່າໃຊ້ຈ່າຍເພີ່ມເຕີມໃນລະຫວ່າງການໂຣມມິງ" + "ການປ່ອຍສັນຍານບໍ່ມີອິນເຕີເນັດ" + "ອຸປະກອນບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້" + "ປິດການປ່ອຍສັນຍານ" + "ຮັອດສະປອດ ຫຼື ການປ່ອຍສັນຍານເປີດຢູ່" + "ອາດມີຄ່າບໍລິການເພີ່ມເຕີມໃນລະຫວ່າງການໂຣມມິງ" diff --git a/Tethering/res/values-mcc311-mnc480-lt/strings.xml b/Tethering/res/values-mcc311-mnc480-lt/strings.xml index 011c2c11fb..267c7f6666 100644 --- a/Tethering/res/values-mcc311-mnc480-lt/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-lt/strings.xml @@ -16,9 +16,9 @@ - "Nėra įrenginio kaip modemo naudojimo interneto ryšio" - "Nepavyko susieti įrenginių" - "Išjungti įrenginio kaip modemo naudojimą" - "Įjungtas viešosios interneto prieigos taškas arba įrenginio kaip modemo naudojimas" - "Veikiant tarptinkliniam ryšiui gali būti taikomi papildomi mokesčiai" + "Nėra įrenginio kaip modemo naudojimo interneto ryšio" + "Nepavyko susieti įrenginių" + "Išjungti įrenginio kaip modemo naudojimą" + "Įjungtas viešosios interneto prieigos taškas arba įrenginio kaip modemo naudojimas" + "Veikiant tarptinkliniam ryšiui gali būti taikomi papildomi mokesčiai" diff --git a/Tethering/res/values-mcc311-mnc480-lv/strings.xml b/Tethering/res/values-mcc311-mnc480-lv/strings.xml index 5cb2f3b7aa..ca54195c7d 100644 --- a/Tethering/res/values-mcc311-mnc480-lv/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-lv/strings.xml @@ -16,9 +16,9 @@ - "Piesaistei nav interneta savienojuma" - "Nevar savienot ierīces" - "Izslēgt piesaisti" - "Ir ieslēgts tīklājs vai piesaiste" - "Viesabonēšanas laikā var tikt piemērota papildu samaksa" + "Piesaistei nav interneta savienojuma" + "Nevar savienot ierīces" + "Izslēgt piesaisti" + "Ir ieslēgts tīklājs vai piesaiste" + "Viesabonēšanas laikā var tikt piemērota papildu maksa." diff --git a/Tethering/res/values-mcc311-mnc480-mk/strings.xml b/Tethering/res/values-mcc311-mnc480-mk/strings.xml index 4cbfd887c5..8c2b8aa8aa 100644 --- a/Tethering/res/values-mcc311-mnc480-mk/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-mk/strings.xml @@ -16,9 +16,9 @@ - "Нема интернет преку мобилен" - "Уредите не може да се поврзат" - "Исклучи интернет преку мобилен" - "Точката на пристап или интернетот преку мобилен е вклучен" - "При роаминг може да се наплатат дополнителни трошоци" + "Нема интернет преку мобилен" + "Уредите не може да се поврзат" + "Исклучи интернет преку мобилен" + "Вклучено: точка на пристап или интернет преку мобилен" + "При роаминг може да се наплатат дополнителни трошоци" diff --git a/Tethering/res/values-mcc311-mnc480-ml/strings.xml b/Tethering/res/values-mcc311-mnc480-ml/strings.xml index 9cf4eaf34a..9a722c564f 100644 --- a/Tethering/res/values-mcc311-mnc480-ml/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-ml/strings.xml @@ -16,9 +16,9 @@ - "ടെതറിംഗിന് ഇന്റർനെറ്റ് ഇല്ല" - "ഉപകരണങ്ങൾ കണക്റ്റ് ചെയ്യാനാവില്ല" - "ടെതറിംഗ് ഓഫാക്കുക" - "ഹോട്ട്‌സ്‌പോട്ട് അല്ലെങ്കിൽ ടെതറിംഗ് ഓണാണ്" - "റോമിംഗ് ചെയ്യുമ്പോൾ അധിക നിരക്കുകൾ ബാധകമായേക്കാം" + "ടെതറിംഗിന് ഇന്റർനെറ്റ് ഇല്ല" + "ഉപകരണങ്ങൾ കണക്റ്റ് ചെയ്യാനാവില്ല" + "ടെതറിംഗ് ഓഫാക്കുക" + "ഹോട്ട്‌സ്‌പോട്ട് അല്ലെങ്കിൽ ടെതറിംഗ് ഓണാണ്" + "റോമിംഗ് ചെയ്യുമ്പോൾ അധിക നിരക്കുകൾ ബാധകമായേക്കാം" diff --git a/Tethering/res/values-mcc311-mnc480-mn/strings.xml b/Tethering/res/values-mcc311-mnc480-mn/strings.xml index 47c82c14d9..f6fcf01e14 100644 --- a/Tethering/res/values-mcc311-mnc480-mn/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-mn/strings.xml @@ -16,9 +16,9 @@ - "Модемд интернэт алга байна" - "Төхөөрөмжүүд холбогдох боломжгүй байна" - "Модем болгохыг унтраах" - "Сүлжээний цэг эсвэл модем болгох асаалттай байна" - "Роумингийн үеэр нэмэлт төлбөр нэхэмжилж болзошгүй" + "Модем болгоход ямар ч интернэт байхгүй байна" + "Төхөөрөмжүүд холбогдох боломжгүй байна" + "Модем болгохыг унтраах" + "Сүлжээний цэг эсвэл модем болгох асаалттай байна" + "Роумингийн үеэр нэмэлт төлбөр тооцогдож магадгүй" diff --git a/Tethering/res/values-mcc311-mnc480-mr/strings.xml b/Tethering/res/values-mcc311-mnc480-mr/strings.xml index ad9e809ab2..2563e15f29 100644 --- a/Tethering/res/values-mcc311-mnc480-mr/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-mr/strings.xml @@ -16,9 +16,9 @@ - "टेदरिंगला इंटरनेट नाही" - "डिव्हाइस कनेक्ट होऊ शकत नाहीत" - "टेदरिंग बंद करा" - "हॉटस्पॉट किंवा टेदरिंग सुरू आहे" - "रोमिंगदरम्यान अतिरिक्त शुल्क लागू होऊ शकतात" + "टेदरिंगसाठी इंटरनेट नाही" + "डिव्हाइस कनेक्ट होऊ शकत नाहीत" + "टेदरिंग बंद करा" + "हॉटस्पॉट किंवा टेदरिंग सुरू आहे" + "रोमिंगदरम्यान अतिरिक्त शुल्के लागू होऊ शकतात" diff --git a/Tethering/res/values-mcc311-mnc480-ms/strings.xml b/Tethering/res/values-mcc311-mnc480-ms/strings.xml index e708cb8717..b2ccbbbf53 100644 --- a/Tethering/res/values-mcc311-mnc480-ms/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-ms/strings.xml @@ -16,9 +16,9 @@ - "Penambatan tiada Internet" - "Peranti tidak dapat disambungkan" - "Matikan penambatan" - "Tempat liputan atau penambatan dihidupkan" - "Caj tambahan mungkin digunakan semasa perayauan" + "Penambatan tiada Internet" + "Peranti tidak dapat disambungkan" + "Matikan penambatan" + "Tempat liputan atau penambatan dihidupkan" + "Caj tambahan boleh dikenakan semasa perayauan" diff --git a/Tethering/res/values-mcc311-mnc480-my/strings.xml b/Tethering/res/values-mcc311-mnc480-my/strings.xml index ba5462250b..2281b7beec 100644 --- a/Tethering/res/values-mcc311-mnc480-my/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-my/strings.xml @@ -16,9 +16,9 @@ - "မိုဘိုင်းဖုန်းသုံး ချိတ်ဆက်မျှဝေခြင်းတွင် အင်တာနက် မရှိပါ" - "စက်များ ချိတ်ဆက်၍ မရပါ" - "မိုဘိုင်းဖုန်းသုံး ချိတ်ဆက်မျှဝေခြင်း ပိတ်ရန်" - "ဟော့စပေါ့ (သို့) မိုဘိုင်းဖုန်းသုံး ချိတ်ဆက်မျှဝေခြင်း ဖွင့်ထားသည်" - "ပြင်ပကွန်ရက်နှင့် ချိတ်ဆက်သည့်အခါ နောက်ထပ်ကျသင့်မှုများ ရှိနိုင်သည်" + "မိုဘိုင်းသုံး၍ ချိတ်ဆက်ခြင်းတွင် အင်တာနက် မရှိပါ" + "စက်ပစ္စည်းများကို ချိတ်ဆက်၍မရပါ" + "မိုဘိုင်းသုံး၍ ချိတ်ဆက်ခြင်း ပိတ်ရန်" + "ဟော့စပေါ့ (သို့) မိုဘိုင်းသုံး၍ ချိတ်ဆက်ခြင်း ဖွင့်ထားသည်" + "ပြင်ပကွန်ရက်သုံးနေစဉ် နောက်ထပ်ကျသင့်ငွေ ပေးရနိုင်သည်" diff --git a/Tethering/res/values-mcc311-mnc480-nb/strings.xml b/Tethering/res/values-mcc311-mnc480-nb/strings.xml index 57db484a25..92e630017a 100644 --- a/Tethering/res/values-mcc311-mnc480-nb/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-nb/strings.xml @@ -16,9 +16,9 @@ - "Internettdeling har ikke internettilgang" - "Enhetene kan ikke koble til" - "Slå av internettdeling" - "Wi-Fi-sone eller internettdeling er på" - "Ytterligere kostnader kan påløpe under roaming" + "Internettdeling har ikke internettilgang" + "Enheter kan ikke koble til" + "Slå av internettdeling" + "Wifi-sone eller internettdeling er på" + "Det kan påløpe flere kostnader ved roaming" diff --git a/Tethering/res/values-mcc311-mnc480-ne/strings.xml b/Tethering/res/values-mcc311-mnc480-ne/strings.xml index 1503244f50..bfd6108aaf 100644 --- a/Tethering/res/values-mcc311-mnc480-ne/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-ne/strings.xml @@ -16,9 +16,9 @@ - "टेदरिङमार्फत इन्टरनेट कनेक्सन प्राप्त हुन सकेन" - "यन्त्रहरू कनेक्ट गर्न सकिएन" - "टेदरिङ निष्क्रिय पार्नुहोस्" - "हटस्पट वा टेदरिङ सक्रिय छ" - "रोमिङ सेवा प्रयोग गर्दा अतिरिक्त शुल्क लाग्न सक्छ" + "टेदरिङमार्फत इन्टरनेट कनेक्ट गर्न सकिएन" + "डिभाइसहरू कनेक्ट गर्न सकिएन" + "टेदरिङ अफ गर्नुहोस्" + "हटस्पट वा टेदरिङ अन छ" + "रोमिङ सेवा प्रयोग गर्दा अतिरिक्त शुल्क लाग्न सक्छ" diff --git a/Tethering/res/values-mcc311-mnc480-nl/strings.xml b/Tethering/res/values-mcc311-mnc480-nl/strings.xml index b08133f4e5..7533b6ffeb 100644 --- a/Tethering/res/values-mcc311-mnc480-nl/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-nl/strings.xml @@ -16,9 +16,9 @@ - "Tethering heeft geen internet" - "Apparaten kunnen niet worden verbonden" - "Tethering uitschakelen" - "Hotspot of tethering is ingeschakeld" - "Er kunnen extra kosten voor roaming in rekening worden gebracht." + "Tethering heeft geen internet" + "Apparaten kunnen geen verbinding maken" + "Tethering uitzetten" + "Hotspot of tethering staat aan" + "Er kunnen extra kosten voor roaming in rekening worden gebracht" diff --git a/Tethering/res/values-mcc311-mnc480-or/strings.xml b/Tethering/res/values-mcc311-mnc480-or/strings.xml index 1ad4ca354a..7324de1a00 100644 --- a/Tethering/res/values-mcc311-mnc480-or/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-or/strings.xml @@ -16,9 +16,9 @@ - "ଟିଥରିଂ ପାଇଁ କୌଣସି ଇଣ୍ଟର୍ନେଟ୍ ସଂଯୋଗ ନାହିଁ" - "ଡିଭାଇସଗୁଡ଼ିକ ସଂଯୋଗ କରାଯାଇପାରିବ ନାହିଁ" - "ଟିଥରିଂ ବନ୍ଦ କରନ୍ତୁ" - "ହଟସ୍ପଟ୍ କିମ୍ବା ଟିଥରିଂ ଚାଲୁ ଅଛି" - "ରୋମିଂରେ ଥିବା ସମୟରେ ଅତିରିକ୍ତ ଶୁଳ୍କ ଲାଗୁ ହୋଇପାରେ" + "ଟିଥରିଂ ପାଇଁ କୌଣସି ଇଣ୍ଟରନେଟ କନେକ୍ସନ ନାହିଁ" + "ଡିଭାଇସଗୁଡ଼ିକୁ କନେକ୍ଟ କରାଯାଇପାରିବ ନାହିଁ" + "ଟିଥରିଂକୁ ବନ୍ଦ କରନ୍ତୁ" + "ହଟସ୍ପଟ କିମ୍ବା ଟିଥରିଂ ଚାଲୁ ଅଛି" + "ରୋମିଂ ସମୟରେ ଅତିରିକ୍ତ ଚାର୍ଜ ଲାଗୁ ହୋଇପାରେ" diff --git a/Tethering/res/values-mcc311-mnc480-pa/strings.xml b/Tethering/res/values-mcc311-mnc480-pa/strings.xml index 88def563d8..0ca0af5ebd 100644 --- a/Tethering/res/values-mcc311-mnc480-pa/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-pa/strings.xml @@ -16,9 +16,9 @@ - "ਟੈਦਰਿੰਗ ਕੋਲ ਇੰਟਰਨੈੱਟ ਪਹੁੰਚ ਨਹੀਂ ਹੈ" - "ਡੀਵਾਈਸ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ" - "ਟੈਦਰਿੰਗ ਬੰਦ ਕਰੋ" - "ਹੌਟਸਪੌਟ ਜਾਂ ਟੈਦਰਿੰਗ ਚਾਲੂ ਹੈ" - "ਰੋਮਿੰਗ ਦੌਰਾਨ ਵਧੀਕ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ" + "ਟੈਦਰਿੰਗ ਕੋਲ ਇੰਟਰਨੈੱਟ ਪਹੁੰਚ ਨਹੀਂ ਹੈ" + "ਡੀਵਾਈਸ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ" + "ਟੈਦਰਿੰਗ ਬੰਦ ਕਰੋ" + "ਹੌਟਸਪੌਟ ਜਾਂ ਟੈਦਰਿੰਗ ਚਾਲੂ ਹੈ" + "ਰੋਮਿੰਗ ਦੌਰਾਨ ਵਧੀਕ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ" diff --git a/Tethering/res/values-mcc311-mnc480-pl/strings.xml b/Tethering/res/values-mcc311-mnc480-pl/strings.xml index f9890abdc2..62bb68c64f 100644 --- a/Tethering/res/values-mcc311-mnc480-pl/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-pl/strings.xml @@ -16,9 +16,9 @@ - "Tethering nie ma internetu" - "Urządzenia nie mogą się połączyć" - "Wyłącz tethering" - "Hotspot lub tethering jest włączony" - "Podczas korzystania z roamingu mogą zostać naliczone dodatkowe opłaty" + "Tethering nie ma internetu" + "Urządzenia nie mogą się połączyć" + "Wyłącz tethering" + "Hotspot lub tethering jest włączony" + "Podczas korzystania z roamingu mogą zostać naliczone dodatkowe opłaty" diff --git a/Tethering/res/values-mcc311-mnc480-pt-rBR/strings.xml b/Tethering/res/values-mcc311-mnc480-pt-rBR/strings.xml index ce3b88479f..ae033fa98d 100644 --- a/Tethering/res/values-mcc311-mnc480-pt-rBR/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-pt-rBR/strings.xml @@ -16,9 +16,9 @@ - "O tethering não tem Internet" - "Não é possível conectar os dispositivos" - "Desativar o tethering" - "Ponto de acesso ou tethering ativado" - "Pode haver cobranças extras durante o roaming" + "O tethering não tem uma conexão de Internet" + "Não é possível conectar os dispositivos" + "Desativar o tethering" + "O ponto de acesso ou tethering está ativado" + "Pode haver cobranças extras durante o roaming" diff --git a/Tethering/res/values-mcc311-mnc480-pt-rPT/strings.xml b/Tethering/res/values-mcc311-mnc480-pt-rPT/strings.xml index 7e883ea576..c54486425d 100644 --- a/Tethering/res/values-mcc311-mnc480-pt-rPT/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-pt-rPT/strings.xml @@ -16,9 +16,9 @@ - "A ligação (à Internet) via telemóvel não tem Internet" - "Não é possível ligar os dispositivos" - "Desativar ligação (à Internet) via telemóvel" - "A zona Wi-Fi ou a ligação (à Internet) via telemóvel está ativada" - "Podem aplicar-se custos adicionais em roaming." + "A ligação (à Internet) via telemóvel não tem Internet" + "Não é possível ligar os dispositivos" + "Desativar ligação (à Internet) via telemóvel" + "A zona Wi-Fi ou a ligação (à Internet) via telemóvel está ativada" + "Podem aplicar-se custos adicionais em roaming" diff --git a/Tethering/res/values-mcc311-mnc480-pt/strings.xml b/Tethering/res/values-mcc311-mnc480-pt/strings.xml index ce3b88479f..ae033fa98d 100644 --- a/Tethering/res/values-mcc311-mnc480-pt/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-pt/strings.xml @@ -16,9 +16,9 @@ - "O tethering não tem Internet" - "Não é possível conectar os dispositivos" - "Desativar o tethering" - "Ponto de acesso ou tethering ativado" - "Pode haver cobranças extras durante o roaming" + "O tethering não tem uma conexão de Internet" + "Não é possível conectar os dispositivos" + "Desativar o tethering" + "O ponto de acesso ou tethering está ativado" + "Pode haver cobranças extras durante o roaming" diff --git a/Tethering/res/values-mcc311-mnc480-ro/strings.xml b/Tethering/res/values-mcc311-mnc480-ro/strings.xml index 1009417316..484b8b39da 100644 --- a/Tethering/res/values-mcc311-mnc480-ro/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-ro/strings.xml @@ -16,9 +16,9 @@ - "Procesul de tethering nu are internet" - "Dispozitivele nu se pot conecta" - "Dezactivați procesul de tethering" - "S-a activat hotspotul sau tethering" - "Se pot aplica taxe suplimentare pentru roaming" + "Procesul de tethering nu are internet" + "Dispozitivele nu se pot conecta" + "Dezactivează tetheringul" + "S-a activat hotspotul sau tetheringul" + "Se pot aplica taxe suplimentare pentru roaming" diff --git a/Tethering/res/values-mcc311-mnc480-ru/strings.xml b/Tethering/res/values-mcc311-mnc480-ru/strings.xml index 88683bed95..ef387033eb 100644 --- a/Tethering/res/values-mcc311-mnc480-ru/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-ru/strings.xml @@ -16,9 +16,9 @@ - "Режим модема используется без доступа к Интернету" - "Невозможно подключить устройства." - "Отключить режим модема" - "Включены точка доступа или режим модема" - "За использование услуг связи в роуминге может взиматься дополнительная плата." + "Режим модема используется без доступа к интернету" + "Невозможно подключить устройства." + "Отключить режим модема" + "Включена точка доступа или режим модема" + "За использование услуг связи в роуминге может взиматься дополнительная плата." diff --git a/Tethering/res/values-mcc311-mnc480-si/strings.xml b/Tethering/res/values-mcc311-mnc480-si/strings.xml index 176bcdb797..3069085dba 100644 --- a/Tethering/res/values-mcc311-mnc480-si/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-si/strings.xml @@ -16,9 +16,9 @@ - "ටෙදරින් හට අන්තර්ජාලය නැත" - "උපාංගවලට සම්බන්ධ විය නොහැකිය" - "ටෙදරින් ක්‍රියාවිරහිත කරන්න" - "හොට්ස්පොට් හෝ ටෙදරින් ක්‍රියාත්මකයි" - "රෝමිං අතරතුර අමතර ගාස්තු අදාළ විය හැකිය" + "ටෙදරින් හට අන්තර්ජාලය නැත" + "උපාංගවලට සම්බන්ධ විය නොහැක" + "ටෙදරින් ක්‍රියාවිරහිත කරන්න" + "හොට්ස්පොට් හෝ ටෙදරින් ක්‍රියාත්මකයි" + "රෝමිං අතරේ අතිරේක ගාස්තු අදාළ විය හැක" diff --git a/Tethering/res/values-mcc311-mnc480-sk/strings.xml b/Tethering/res/values-mcc311-mnc480-sk/strings.xml index b9e2127fa8..9f70311343 100644 --- a/Tethering/res/values-mcc311-mnc480-sk/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-sk/strings.xml @@ -16,9 +16,9 @@ - "Tethering nemá internetové pripojenie" - "Zariadenia sa nemôžu pripojiť" - "Vypnúť tethering" - "Je zapnutý hotspot alebo tethering" - "Počas roamingu vám môžu byť účtované ďalšie poplatky" + "Tethering nemá internetové pripojenie" + "Zariadenia sa nemôžu pripojiť" + "Vypnúť tethering" + "Je zapnutý hotspot alebo tethering" + "Počas roamingu vám môžu byť účtované ďalšie poplatky" diff --git a/Tethering/res/values-mcc311-mnc480-sl/strings.xml b/Tethering/res/values-mcc311-mnc480-sl/strings.xml index e8140e686a..613d7a887d 100644 --- a/Tethering/res/values-mcc311-mnc480-sl/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-sl/strings.xml @@ -16,9 +16,9 @@ - "Internetna povezava prek mobilnega telefona ni vzpostavljena" - "Napravi se ne moreta povezati" - "Izklopi internetno povezavo prek mobilnega telefona" - "Dostopna točka ali internetna povezava prek mobilnega telefona je vklopljena" - "Med gostovanjem lahko nastanejo dodatni stroški" + "Povezava računalnika z internetom prek mobilnega telefona nima internetne povezave" + "Napravi se ne moreta povezati" + "Izklopi povezavo računalnika z internetom prek mobilnega telefona" + "Dostopna točka ali povezava računalnika z internetom prek mobilnega telefona je vklopljena" + "Med gostovanjem lahko nastanejo dodatni stroški." diff --git a/Tethering/res/values-mcc311-mnc480-sq/strings.xml b/Tethering/res/values-mcc311-mnc480-sq/strings.xml index 61e698d6e8..0472d4ddbd 100644 --- a/Tethering/res/values-mcc311-mnc480-sq/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-sq/strings.xml @@ -16,9 +16,9 @@ - "Ndarja e internetit nuk ka internet" - "Pajisjet nuk mund të lidhen" - "Çaktivizo ndarjen e internetit" - "Zona e qasjes për internet ose ndarja e internetit është aktive" - "Mund të zbatohen tarifime shtesë kur je në roaming" + "Ndarja e internetit nuk ka internet" + "Pajisjet nuk mund të lidhen" + "Çaktivizo ndarjen e internetit" + "Zona e qasjes për internet ose ndarja e internetit është aktive" + "Mund të zbatohen tarifime shtesë kur je në roaming" diff --git a/Tethering/res/values-mcc311-mnc480-sr/strings.xml b/Tethering/res/values-mcc311-mnc480-sr/strings.xml index b4c411c354..bc70cf6762 100644 --- a/Tethering/res/values-mcc311-mnc480-sr/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-sr/strings.xml @@ -16,9 +16,9 @@ - "Привезивање нема приступ интернету" - "Повезивање уређаја није успело" - "Искључи привезивање" - "Укључен је хотспот или привезивање" - "Можда важе додатни трошкови у ромингу" + "Привезивање нема приступ интернету" + "Повезивање уређаја није успело" + "Искључи привезивање" + "Укључен је хотспот или привезивање" + "Можда важе додатни трошкови у ромингу" diff --git a/Tethering/res/values-mcc311-mnc480-sv/strings.xml b/Tethering/res/values-mcc311-mnc480-sv/strings.xml index 4f543e47b9..507acc82b9 100644 --- a/Tethering/res/values-mcc311-mnc480-sv/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-sv/strings.xml @@ -16,9 +16,9 @@ - "Det finns ingen internetanslutning för internetdelningen" - "Enheterna kan inte anslutas" - "Inaktivera internetdelning" - "Surfzon eller internetdelning har aktiverats" - "Ytterligare avgifter kan tillkomma vid roaming" + "Det finns ingen internetanslutning för internetdelningen" + "Enheterna kan inte anslutas" + "Inaktivera internetdelning" + "Surfzon eller internetdelning har aktiverats" + "Ytterligare avgifter kan tillkomma vid roaming" diff --git a/Tethering/res/values-mcc311-mnc480-sw/strings.xml b/Tethering/res/values-mcc311-mnc480-sw/strings.xml index ac347ab485..865b0e38a5 100644 --- a/Tethering/res/values-mcc311-mnc480-sw/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-sw/strings.xml @@ -16,9 +16,9 @@ - "Kipengele cha kusambaza mtandao hakina intaneti" - "Imeshindwa kuunganisha vifaa" - "Zima kipengele cha kusambaza mtandao" - "Umewasha kipengele cha kusambaza mtandao au mtandao pepe" - "Huenda ukatozwa gharama za ziada ukitumia mitandao ya ng\'ambo" + "Huduma ya kusambaza mtandao haina muunganisho wa intaneti" + "Imeshindwa kuunganisha vifaa" + "Zima kipengele cha kusambaza mtandao" + "Umewasha kipengele cha kusambaza mtandao au mtandao pepe" + "Huenda ukatozwa gharama za ziada ukitumia mitandao ya ng\'ambo" diff --git a/Tethering/res/values-mcc311-mnc480-ta/strings.xml b/Tethering/res/values-mcc311-mnc480-ta/strings.xml index 2ea2467e58..e5f33ee9bb 100644 --- a/Tethering/res/values-mcc311-mnc480-ta/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-ta/strings.xml @@ -16,9 +16,9 @@ - "இணைப்பு முறைக்கு இணைய இணைப்பு இல்லை" - "சாதனங்களால் இணைய முடியவில்லை" - "இணைப்பு முறையை ஆஃப் செய்" - "ஹாட்ஸ்பாட் அல்லது இணைப்பு முறை ஆன் செய்யப்பட்டுள்ளது" - "ரோமிங்கின்போது கூடுதல் கட்டணங்கள் விதிக்கப்படக்கூடும்" + "இணைப்பு முறைக்கு இணைய இணைப்பு இல்லை" + "சாதனங்களால் இணைய முடியவில்லை" + "இணைப்பு முறையை முடக்கு" + "ஹாட்ஸ்பாட் அல்லது இணைப்பு முறை இயக்கப்பட்டுள்ளது" + "ரோமிங்கின்போது கூடுதல் கட்டணங்கள் விதிக்கப்படலாம்" diff --git a/Tethering/res/values-mcc311-mnc480-te/strings.xml b/Tethering/res/values-mcc311-mnc480-te/strings.xml index 9360297dd8..1bb4786ed7 100644 --- a/Tethering/res/values-mcc311-mnc480-te/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-te/strings.xml @@ -16,9 +16,9 @@ - "టెథరింగ్ చేయడానికి ఇంటర్నెట్ కనెక్షన్ లేదు" - "పరికరాలు కనెక్ట్ అవ్వడం లేదు" - "టెథరింగ్‌ను ఆఫ్ చేయండి" - "హాట్‌స్పాట్ లేదా టెథరింగ్ ఆన్‌లో ఉంది" - "రోమింగ్‌లో ఉన్నప్పుడు అదనపు ఛార్జీలు వర్తించవచ్చు" + "టెథరింగ్ చేయడానికి ఇంటర్నెట్ కనెక్షన్ లేదు" + "పరికరాలు కనెక్ట్ అవ్వడం లేదు" + "టెథరింగ్‌ను ఆఫ్ చేయండి" + "హాట్‌స్పాట్ లేదా టెథరింగ్ ఆన్‌లో ఉంది" + "రోమింగ్‌లో ఉన్నప్పుడు అదనపు ఛార్జీలు వర్తించవచ్చు" diff --git a/Tethering/res/values-mcc311-mnc480-th/strings.xml b/Tethering/res/values-mcc311-mnc480-th/strings.xml index 9c4d7e08f2..e76f735b45 100644 --- a/Tethering/res/values-mcc311-mnc480-th/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-th/strings.xml @@ -16,9 +16,9 @@ - "การเชื่อมต่ออินเทอร์เน็ตผ่านมือถือไม่มีอินเทอร์เน็ต" - "อุปกรณ์เชื่อมต่อไม่ได้" - "ปิดการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ" - "ฮอตสปอตหรือการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือเปิดอยู่" - "อาจมีค่าใช้จ่ายเพิ่มเติมขณะโรมมิ่ง" + "ไม่มีอินเทอร์เน็ตสำหรับการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ" + "อุปกรณ์เชื่อมต่อไม่ได้" + "ปิดการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ" + "ฮอตสปอตหรือการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือเปิดอยู่" + "อาจมีค่าใช้จ่ายเพิ่มเติมขณะโรมมิ่ง" diff --git a/Tethering/res/values-mcc311-mnc480-tl/strings.xml b/Tethering/res/values-mcc311-mnc480-tl/strings.xml index a7c78a5932..cccc8c4308 100644 --- a/Tethering/res/values-mcc311-mnc480-tl/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-tl/strings.xml @@ -16,9 +16,9 @@ - "Walang internet ang pag-tether" - "Hindi makakonekta ang mga device" - "I-off ang pag-tether" - "Naka-on ang Hotspot o pag-tether" - "Posibleng magkaroon ng mga karagdagang singil habang nagro-roam" + "Walang internet ang pag-tether" + "Hindi makakonekta ang mga device" + "I-off ang pag-tether" + "Naka-on ang hotspot o pag-tether" + "Posibleng magkaroon ng mga karagdagang singil habang nagro-roam" diff --git a/Tethering/res/values-mcc311-mnc480-tr/strings.xml b/Tethering/res/values-mcc311-mnc480-tr/strings.xml index 93da2c3f79..93bef125eb 100644 --- a/Tethering/res/values-mcc311-mnc480-tr/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-tr/strings.xml @@ -16,9 +16,9 @@ - "Tethering\'in internet bağlantısı yok" - "Cihazlar bağlanamıyor" - "Tethering\'i kapat" - "Hotspot veya tethering açık" - "Dolaşım sırasında ek ücretler uygulanabilir" + "Tethering\'in internet bağlantısı yok" + "Cihazlar bağlanamıyor" + "Tethering\'i kapat" + "Hotspot veya tethering açık" + "Dolaşım sırasında ek ücretler uygulanabilir" diff --git a/Tethering/res/values-mcc311-mnc480-uk/strings.xml b/Tethering/res/values-mcc311-mnc480-uk/strings.xml index ee0dcd2c4b..1bc2c06dd4 100644 --- a/Tethering/res/values-mcc311-mnc480-uk/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-uk/strings.xml @@ -16,9 +16,9 @@ - "Телефон, який використовується як модем, не підключений до Інтернету" - "Не вдається підключити пристрої" - "Вимкнути використання телефона як модема" - "Увімкнено точку доступу або використання телефона як модема" - "У роумінгу може стягуватися додаткова плата" + "Телефон, що використовується як модем, не підключений до Інтернету" + "Не вдається підключити пристрої" + "Вимкнути використання телефона як модема" + "Увімкнено точку доступу або використання телефона як модема" + "У роумінгу може стягуватися додаткова плата" diff --git a/Tethering/res/values-mcc311-mnc480-ur/strings.xml b/Tethering/res/values-mcc311-mnc480-ur/strings.xml index 41cd28eef9..63d8e1bf7d 100644 --- a/Tethering/res/values-mcc311-mnc480-ur/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-ur/strings.xml @@ -16,9 +16,9 @@ - "ٹیدرنگ میں انٹرنیٹ نہیں ہے" - "آلات منسلک نہیں ہو سکتے" - "ٹیدرنگ آف کریں" - "ہاٹ اسپاٹ یا ٹیدرنگ آن ہے" - "رومنگ کے دوران اضافی چارجز لاگو ہو سکتے ہیں" + "ٹیدرنگ میں انٹرنیٹ نہیں ہے" + "آلات منسلک نہیں ہو سکتے" + "ٹیدرنگ آف کریں" + "ہاٹ اسپاٹ یا ٹیدرنگ آن ہے" + "رومنگ کے دوران اضافی چارجز لاگو ہو سکتے ہیں" diff --git a/Tethering/res/values-mcc311-mnc480-uz/strings.xml b/Tethering/res/values-mcc311-mnc480-uz/strings.xml index c847bc943b..4d655d97ae 100644 --- a/Tethering/res/values-mcc311-mnc480-uz/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-uz/strings.xml @@ -16,9 +16,9 @@ - "Modem internetga ulanmagan" - "Qurilmalar ulanmadi" - "Modem rejimini faolsizlantirish" - "Hotspot yoki modem rejimi yoniq" - "Rouming vaqtida qoʻshimcha haq olinishi mumkin" + "Modem internetga ulanmagan" + "Qurilmalar ulanmadi" + "Modem rejimini faolsizlantirish" + "Hotspot yoki modem rejimi yoniq" + "Rouming vaqtida qoʻshimcha haq olinishi mumkin" diff --git a/Tethering/res/values-mcc311-mnc480-vi/strings.xml b/Tethering/res/values-mcc311-mnc480-vi/strings.xml index a74326f09e..15e7a01553 100644 --- a/Tethering/res/values-mcc311-mnc480-vi/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-vi/strings.xml @@ -16,9 +16,9 @@ - "Không có Internet để chia sẻ kết Internet" - "Các thiết bị không thể kết nối" - "Tắt tính năng chia sẻ Internet" - "Điểm phát sóng hoặc tính năng chia sẻ Internet đang bật" - "Bạn có thể mất thêm phí dữ liệu khi chuyển vùng" + "Không có Internet để chia sẻ Internet" + "Các thiết bị không thể kết nối" + "Tắt tính năng chia sẻ Internet" + "Điểm phát sóng hoặc tính năng chia sẻ Internet đang bật" + "Bạn có thể mất thêm phí dữ liệu khi chuyển vùng" diff --git a/Tethering/res/values-mcc311-mnc480-zh-rCN/strings.xml b/Tethering/res/values-mcc311-mnc480-zh-rCN/strings.xml index d7370036e3..8a200aa262 100644 --- a/Tethering/res/values-mcc311-mnc480-zh-rCN/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-zh-rCN/strings.xml @@ -16,9 +16,9 @@ - "共享网络未连接到互联网" - "设备无法连接" - "关闭网络共享" - "热点或网络共享已开启" - "漫游时可能会产生额外的费用" + "共享网络未连接到互联网" + "设备无法连接" + "关闭网络共享" + "热点或网络共享已开启" + "漫游时可能会产生额外的费用" diff --git a/Tethering/res/values-mcc311-mnc480-zh-rHK/strings.xml b/Tethering/res/values-mcc311-mnc480-zh-rHK/strings.xml index f378a9dc2c..b2e64d1825 100644 --- a/Tethering/res/values-mcc311-mnc480-zh-rHK/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-zh-rHK/strings.xml @@ -16,9 +16,9 @@ - "無法透過網絡共享連線至互聯網" - "裝置無法連接" - "關閉網絡共享" - "熱點或網絡共享已開啟" - "漫遊時可能需要支付額外費用" + "無法透過網絡共享連線至互聯網" + "裝置無法連接" + "關閉網絡共享" + "熱點或網絡共享已開啟" + "漫遊時可能需要支付額外費用" diff --git a/Tethering/res/values-mcc311-mnc480-zh-rTW/strings.xml b/Tethering/res/values-mcc311-mnc480-zh-rTW/strings.xml index cd653df1da..0d7ddf2b76 100644 --- a/Tethering/res/values-mcc311-mnc480-zh-rTW/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-zh-rTW/strings.xml @@ -16,9 +16,9 @@ - "無法透過網路共用連上網際網路" - "裝置無法連線" - "關閉網路共用" - "無線基地台或網路共用已開啟" - "使用漫遊服務可能須支付額外費用" + "無法透過網路共用連上網際網路" + "裝置無法連線" + "關閉網路共用" + "無線基地台或網路共用已開啟" + "使用漫遊服務可能須支付額外費用" diff --git a/Tethering/res/values-mcc311-mnc480-zu/strings.xml b/Tethering/res/values-mcc311-mnc480-zu/strings.xml index 32f6df56f1..d18f079599 100644 --- a/Tethering/res/values-mcc311-mnc480-zu/strings.xml +++ b/Tethering/res/values-mcc311-mnc480-zu/strings.xml @@ -16,9 +16,9 @@ - "Ukusebenzisa ifoni njengemodemu akunayo i-inthanethi" - "Amadivayisi awakwazi ukuxhumeka" - "Vala ukusebenzisa ifoni njengemodemu" - "I-hotspot noma ukusebenzisa ifoni njengemodemu kuvuliwe" - "Kungaba nezinkokhelo ezengeziwe uma uzula" + "Ukusebenzisa ifoni njengemodemu akunayo i-inthanethi" + "Amadivayisi awakwazi ukuxhuma" + "Vala ukusebenzisa ifoni njengemodemu" + "I-hotspot noma ukusebenzisa ifoni njengemodemu kuvuliwe" + "Kungaba nezinkokhelo ezengeziwe uma uzula" diff --git a/Tethering/res/values-mk/strings.xml b/Tethering/res/values-mk/strings.xml index 9ad9b9a589..f1b15e69c1 100644 --- a/Tethering/res/values-mk/strings.xml +++ b/Tethering/res/values-mk/strings.xml @@ -16,14 +16,14 @@ - "Активно е врзување или точка на пристап" - "Допрете за поставување." - "Врзувањето е оневозможено" - "Контактирајте со администраторот за детали" - "Статус на точката на пристап и врзувањето" - - - - - + "Активно: интернет преку мобилен или точка на пристап" + "Допрете за поставување." + "Интернетот преку мобилен е оневозможен" + "За детали, контактирајте со администраторот" + "Статус на точка на пристап и интернет преку мобилен" + + + + + diff --git a/Tethering/res/values-ml/strings.xml b/Tethering/res/values-ml/strings.xml index 9db79ce220..8182b11f94 100644 --- a/Tethering/res/values-ml/strings.xml +++ b/Tethering/res/values-ml/strings.xml @@ -16,14 +16,14 @@ - "ടെതറിംഗ് അല്ലെങ്കിൽ ഹോട്ട്സ്‌പോട്ട് സജീവമാണ്" - "സജ്ജീകരിക്കാൻ ടാപ്പ് ചെയ്യുക." - "ടെതറിംഗ് പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നു" - "വിശദാംശങ്ങൾക്ക് നിങ്ങളുടെ അഡ്മിനെ ബന്ധപ്പെടുക" - "ഹോട്ട്‌സ്പോട്ടിന്റെയും ടെതറിംഗിന്റെയും നില" - - - - - + "ടെതറിംഗ് അല്ലെങ്കിൽ ഹോട്ട്സ്‌പോട്ട് സജീവമാണ്" + "സജ്ജീകരിക്കാൻ ടാപ്പ് ചെയ്യുക." + "ടെതറിംഗ് പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നു" + "വിശദാംശങ്ങൾക്ക് നിങ്ങളുടെ അഡ്മിനെ ബന്ധപ്പെടുക" + "ഹോട്ട്‌സ്പോട്ടിന്റെയും ടെതറിംഗിന്റെയും നില" + + + + + diff --git a/Tethering/res/values-mn/strings.xml b/Tethering/res/values-mn/strings.xml index 42d1edbace..a9aef5c563 100644 --- a/Tethering/res/values-mn/strings.xml +++ b/Tethering/res/values-mn/strings.xml @@ -16,14 +16,14 @@ - "Модем болгох эсвэл сүлжээний цэг идэвхтэй байна" - "Тохируулахын тулд товшино уу." - "Модем болгохыг идэвхгүй болгосон" - "Дэлгэрэнгүй мэдээлэл авахын тулд админтайгаа холбогдоно уу" - "Сүлжээний цэг болон модем болгох төлөв" - - - - - + "Модем болгох эсвэл сүлжээний цэг идэвхтэй байна" + "Тохируулахын тулд товшино уу." + "Модем болгохыг идэвхгүй болгосон" + "Дэлгэрэнгүй мэдээлэл авах бол админтайгаа холбогдоно уу" + "Сүлжээний цэг болон модем болгохын төлөв" + + + + + diff --git a/Tethering/res/values-mr/strings.xml b/Tethering/res/values-mr/strings.xml index 13995b6b8a..d49cc61dd4 100644 --- a/Tethering/res/values-mr/strings.xml +++ b/Tethering/res/values-mr/strings.xml @@ -16,14 +16,14 @@ - "टेदरिंग किंवा हॉटस्पॉट अ‍ॅक्टिव्ह आहे" - "सेट करण्यासाठी टॅप करा." - "टेदरिंग बंद केले आहे" - "तपशीलांसाठी तुमच्या ॲडमिनशी संपर्क साधा" - "हॉटस्पॉट आणि टेदरिंगची स्थिती" - - - - - + "टेदरिंग किंवा हॉटस्पॉट अ‍ॅक्टिव्ह आहे" + "सेट करण्यासाठी टॅप करा." + "टेदरिंग बंद केले आहे" + "तपशिलांसाठी तुमच्या ॲडमिनशी संपर्क साधा" + "हॉटस्पॉट & टेदरिंग स्टेटस" + + + + + diff --git a/Tethering/res/values-ms/strings.xml b/Tethering/res/values-ms/strings.xml index d6a67f37b1..bc7aab35a6 100644 --- a/Tethering/res/values-ms/strings.xml +++ b/Tethering/res/values-ms/strings.xml @@ -16,14 +16,14 @@ - "Penambatan atau tempat liputan aktif" - "Ketik untuk membuat persediaan." - "Penambatan dilumpuhkan" - "Hubungi pentadbir anda untuk mendapatkan maklumat lanjut" - "Status tempat liputan & penambatan" - - - - - + "Penambatan atau tempat liputan aktif" + "Ketik untuk membuat persediaan." + "Penambatan dilumpuhkan" + "Hubungi pentadbir anda untuk mendapatkan maklumat lanjut" + "Status tempat liputan & penambatan" + + + + + diff --git a/Tethering/res/values-my/strings.xml b/Tethering/res/values-my/strings.xml index 49f6b88a75..4f4042336b 100644 --- a/Tethering/res/values-my/strings.xml +++ b/Tethering/res/values-my/strings.xml @@ -16,14 +16,14 @@ - "မိုဘိုင်းဖုန်းသုံး ချိတ်ဆက်မျှဝေခြင်း သို့မဟုတ် ဟော့စပေါ့ ဖွင့်ထားသည်" - "စနစ်ထည့်သွင်းရန် တို့ပါ။" - "မိုဘိုင်းဖုန်းသုံး ချိတ်ဆက်မျှဝေခြင်းကို ပိတ်ထားသည်" - "အသေးစိတ်အတွက် သင့်စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ" - "ဟော့စပေါ့နှင့် မိုဘိုင်းဖုန်းသုံး ချိတ်ဆက်မျှဝေခြင်း အခြေအနေ" - - - - - + "မိုဘိုင်းသုံး၍ ချိတ်ဆက်ခြင်း (သို့) ဟော့စပေါ့ ဖွင့်ထားသည်" + "စနစ်ထည့်သွင်းရန် တို့ပါ။" + "မိုဘိုင်းသုံး၍ ချိတ်ဆက်ခြင်း ပိတ်ထားသည်" + "အသေးစိတ်သိရန် သင့်စီမံခန့်ခွဲသူထံ ဆက်သွယ်ပါ" + "ဟော့စပေါ့နှင့် မိုဘိုင်းသုံး၍ ချိတ်ဆက်ခြင်း အခြေအနေ" + + + + + diff --git a/Tethering/res/values-nb/strings.xml b/Tethering/res/values-nb/strings.xml index 9594e0a70a..e9024c03d9 100644 --- a/Tethering/res/values-nb/strings.xml +++ b/Tethering/res/values-nb/strings.xml @@ -16,14 +16,14 @@ - "Internettdeling eller Wi-Fi-sone er aktiv" - "Trykk for å konfigurere." - "Internettdeling er slått av" - "Ta kontakt med administratoren din for å få mer informasjon" - "Status for Wi-Fi-sone og internettdeling" - - - - - + "Internettdeling eller wifi-sone er aktiv" + "Trykk for å konfigurere." + "Internettdeling er slått av" + "Kontakt administratoren din for å få mer informasjon" + "Status for wifi-sone og internettdeling" + + + + + diff --git a/Tethering/res/values-ne/strings.xml b/Tethering/res/values-ne/strings.xml index 72ae3a80a9..988d5c20da 100644 --- a/Tethering/res/values-ne/strings.xml +++ b/Tethering/res/values-ne/strings.xml @@ -16,14 +16,14 @@ - "टेदरिङ वा हटस्पट सक्रिय छ" - "सेटअप गर्न ट्याप गर्नुहोस्।" - "टेदरिङ सुविधा असक्षम पारिएको छ" - "विवरणहरूका लागि आफ्ना प्रशासकलाई सम्पर्क गर्नुहोस्" - "हटस्पट तथा टेदरिङको स्थिति" - - - - - + "टेदरिङ वा हटस्पट अन छ" + "सेटअप गर्न ट्याप गर्नुहोस्।" + "टेदरिङ सुविधा अफ गरिएको छ" + "विस्तृत जानकारीका लागि एड्मिनलाई सम्पर्क गर्नुहोस्" + "हटस्पट तथा टेदरिङको स्थिति" + + + + + diff --git a/Tethering/res/values-nl/strings.xml b/Tethering/res/values-nl/strings.xml index 18b2bbfc76..d6a0a1ac3c 100644 --- a/Tethering/res/values-nl/strings.xml +++ b/Tethering/res/values-nl/strings.xml @@ -16,14 +16,14 @@ - "Tethering of hotspot actief" - "Tik om in te stellen." - "Tethering is uitgeschakeld" - "Neem contact op met je beheerder voor meer informatie" - "Status van hotspot en tethering" - - - - - + "Tethering of hotspot actief" + "Tik om in te stellen." + "Tethering staat uit" + "Neem contact op met je beheerder voor meer informatie" + "Status van hotspot en tethering" + + + + + diff --git a/Tethering/res/values-or/strings.xml b/Tethering/res/values-or/strings.xml index a15a6db42a..9abca6c4b2 100644 --- a/Tethering/res/values-or/strings.xml +++ b/Tethering/res/values-or/strings.xml @@ -16,14 +16,14 @@ - "ଟିଥେରିଂ କିମ୍ୱା ହଟସ୍ପଟ୍ ସକ୍ରିୟ ଅଛି" - "ସେଟ୍ ଅପ୍ କରିବାକୁ ଟାପ୍ କରନ୍ତୁ।" - "ଟିଥେରିଂ ଅକ୍ଷମ କରାଯାଇଛି" - "ବିବରଣୀଗୁଡ଼ିକ ପାଇଁ ଆପଣଙ୍କ ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ" - "ହଟସ୍ପଟ୍ ଓ ଟିଥେରିଂ ସ୍ଥିତି" - - - - - + "ଟିଥରିଂ କିମ୍ବା ହଟସ୍ପଟ ସକ୍ରିୟ ଅଛି" + "ସେଟ ଅପ କରିବାକୁ ଟାପ କରନ୍ତୁ।" + "ଟିଥରିଂକୁ ଅକ୍ଷମ କରାଯାଇଛି" + "ବିବରଣୀ ପାଇଁ ଆପଣଙ୍କ ଆଡମିନଙ୍କ ସହ କଣ୍ଟାକ୍ଟ କରନ୍ତୁ" + "ହଟସ୍ପଟ ଏବଂ ଟିଥରିଂ ସ୍ଥିତି" + + + + + diff --git a/Tethering/res/values-pa/strings.xml b/Tethering/res/values-pa/strings.xml index a8235e423e..bcd1c1461e 100644 --- a/Tethering/res/values-pa/strings.xml +++ b/Tethering/res/values-pa/strings.xml @@ -16,14 +16,14 @@ - "ਟੈਦਰਿੰਗ ਜਾਂ ਹੌਟਸਪੌਟ ਕਿਰਿਆਸ਼ੀਲ" - "ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।" - "ਟੈਦਰਿੰਗ ਨੂੰ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ" - "ਵੇਰਵਿਆਂ ਲਈ ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ" - "ਹੌਟਸਪੌਟ ਅਤੇ ਟੈਦਰਿੰਗ ਦੀ ਸਥਿਤੀ" - - - - - + "ਟੈਦਰਿੰਗ ਜਾਂ ਹੌਟਸਪੌਟ ਕਿਰਿਆਸ਼ੀਲ" + "ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।" + "ਟੈਦਰਿੰਗ ਨੂੰ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ" + "ਵੇਰਵਿਆਂ ਲਈ ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ" + "ਹੌਟਸਪੌਟ ਅਤੇ ਟੈਦਰਿੰਗ ਦੀ ਸਥਿਤੀ" + + + + + diff --git a/Tethering/res/values-pl/strings.xml b/Tethering/res/values-pl/strings.xml index ccb017d43f..855afb4e10 100644 --- a/Tethering/res/values-pl/strings.xml +++ b/Tethering/res/values-pl/strings.xml @@ -16,14 +16,14 @@ - "Aktywny tethering lub punkt dostępu" - "Kliknij, by skonfigurować" - "Tethering został wyłączony" - "Aby uzyskać szczegółowe informacje, skontaktuj się z administratorem" - "Hotspot i tethering – stan" - - - - - + "Aktywny tethering lub hotspot" + "Kliknij, aby skonfigurować." + "Tethering jest wyłączony" + "Aby uzyskać szczegółowe informacje, skontaktuj się z administratorem" + "Stan hotspotu i tetheringu" + + + + + diff --git a/Tethering/res/values-pt-rBR/strings.xml b/Tethering/res/values-pt-rBR/strings.xml index a0a4745f93..7e19f0e7e4 100644 --- a/Tethering/res/values-pt-rBR/strings.xml +++ b/Tethering/res/values-pt-rBR/strings.xml @@ -16,14 +16,14 @@ - "Ponto de acesso ou tethering ativo" - "Toque para configurar." - "Tethering desativado" - "Fale com seu administrador para saber detalhes" - "Status de ponto de acesso e tethering" - - - - - + "Ponto de acesso ou tethering ativo" + "Toque para configurar." + "O tethering está desativado" + "Entre em contato com seu administrador para saber detalhes" + "Status do ponto de acesso e do tethering" + + + + + diff --git a/Tethering/res/values-pt-rPT/strings.xml b/Tethering/res/values-pt-rPT/strings.xml index e3f03fcc69..ac8ea5cf89 100644 --- a/Tethering/res/values-pt-rPT/strings.xml +++ b/Tethering/res/values-pt-rPT/strings.xml @@ -16,14 +16,14 @@ - "Ligação (à Internet) via telemóvel ou zona Wi-Fi ativas" - "Toque para configurar." - "A ligação (à Internet) via telemóvel está desativada." - "Contacte o administrador para obter detalhes." - "Estado da zona Wi-Fi e da ligação (à Internet) via telemóvel" - - - - - + "Ligação (à Internet) via telemóvel ou zona Wi-Fi ativa" + "Toque para configurar." + "A ligação (à Internet) via telemóvel está desativada" + "Contacte o administrador para obter detalhes" + "Estado da zona Wi-Fi e da ligação (à Internet) via telemóvel" + + + + + diff --git a/Tethering/res/values-pt/strings.xml b/Tethering/res/values-pt/strings.xml index a0a4745f93..7e19f0e7e4 100644 --- a/Tethering/res/values-pt/strings.xml +++ b/Tethering/res/values-pt/strings.xml @@ -16,14 +16,14 @@ - "Ponto de acesso ou tethering ativo" - "Toque para configurar." - "Tethering desativado" - "Fale com seu administrador para saber detalhes" - "Status de ponto de acesso e tethering" - - - - - + "Ponto de acesso ou tethering ativo" + "Toque para configurar." + "O tethering está desativado" + "Entre em contato com seu administrador para saber detalhes" + "Status do ponto de acesso e do tethering" + + + + + diff --git a/Tethering/res/values-ro/strings.xml b/Tethering/res/values-ro/strings.xml index 5706a4a69c..e022504db3 100644 --- a/Tethering/res/values-ro/strings.xml +++ b/Tethering/res/values-ro/strings.xml @@ -16,14 +16,14 @@ - "Tethering sau hotspot activ" - "Atingeți ca să configurați." - "Tetheringul este dezactivat" - "Contactați administratorul pentru detalii" - "Starea hotspotului și a tetheringului" - - - - - + "Tethering sau hotspot activ" + "Atinge pentru a configura." + "Tetheringul este dezactivat" + "Contactează administratorul pentru detalii" + "Starea hotspotului și a tetheringului" + + + + + diff --git a/Tethering/res/values-ru/strings.xml b/Tethering/res/values-ru/strings.xml index 7cb6f7db3f..4361d70712 100644 --- a/Tethering/res/values-ru/strings.xml +++ b/Tethering/res/values-ru/strings.xml @@ -16,14 +16,14 @@ - "Включен режим модема или точка доступа" - "Нажмите, чтобы настроить." - "Использование телефона в качестве модема запрещено" - "Чтобы узнать подробности, обратитесь к администратору." - "Статус хот-спота и режима модема" - - - - - + "Включен режим модема или точка доступа" + "Нажмите, чтобы настроить." + "Включить режим модема нельзя" + "Чтобы узнать больше, обратитесь к администратору." + "Статус точки доступа и режима модема" + + + + + diff --git a/Tethering/res/values-si/strings.xml b/Tethering/res/values-si/strings.xml index ec34c22de7..14f30e918a 100644 --- a/Tethering/res/values-si/strings.xml +++ b/Tethering/res/values-si/strings.xml @@ -16,14 +16,14 @@ - "ටෙදරින් හෝ හොට්ස්පොට් සක්‍රීයයි" - "පිහිටුවීමට තට්ටු කරන්න." - "ටෙදරින් අබල කර ඇත" - "විස්තර සඳහා ඔබගේ පරිපාලක අමතන්න" - "හොට්ස්පොට් & ටෙදරින් තත්ත්වය" - - - - - + "ටෙදරින් හෝ හොට්ස්පොට් සක්‍රියයි" + "පිහිටුවීමට තට්ටු කරන්න." + "ටෙදරින් අබල කර ඇත" + "විස්තර සඳහා ඔබේ පරිපාලක අමතන්න" + "හොට්ස්පොට් සහ ටෙදරින් තත්ත්වය" + + + + + diff --git a/Tethering/res/values-sk/strings.xml b/Tethering/res/values-sk/strings.xml index 43e787c84f..15845e72a8 100644 --- a/Tethering/res/values-sk/strings.xml +++ b/Tethering/res/values-sk/strings.xml @@ -16,14 +16,14 @@ - "Tethering alebo prístupový bod je aktívny" - "Klepnutím prejdete na nastavenie." - "Tethering je deaktivovaný" - "O podrobnosti požiadajte svojho správcu" - "Stav hotspotu a tetheringu" - - - - - + "Tethering alebo hotspot je aktívny" + "Nastavíte ho klepnutím." + "Tethering je deaktivovaný" + "O podrobnosti požiadajte svojho správcu" + "Stav hotspotu a tetheringu" + + + + + diff --git a/Tethering/res/values-sl/strings.xml b/Tethering/res/values-sl/strings.xml index 59433626a1..4c9bd3cdfb 100644 --- a/Tethering/res/values-sl/strings.xml +++ b/Tethering/res/values-sl/strings.xml @@ -16,14 +16,14 @@ - "Povezava z internetom prek mobilnega telefona ali dostopna točka je aktivna" - "Dotaknite se, če želite nastaviti." - "Povezava z internetom prek mobilnega telefona je onemogočena" - "Za podrobnosti se obrnite na skrbnika" - "Stanje dostopne točke in povezave z internetom prek mobilnega telefona" - - - - - + "Povezava računalnika z internetom prek mobilnega telefona ali dostopna točka je aktivna." + "Dotaknite se za nastavitev." + "Povezava računalnika z internetom prek mobilnega telefona je onemogočena." + "Za podrobnosti se obrnite na skrbnika." + "Stanje dostopne točke in povezave računalnika z internetom prek mobilnega telefona" + + + + + diff --git a/Tethering/res/values-sq/strings.xml b/Tethering/res/values-sq/strings.xml index 21e11558bb..e39e98d61d 100644 --- a/Tethering/res/values-sq/strings.xml +++ b/Tethering/res/values-sq/strings.xml @@ -16,14 +16,14 @@ - "Ndarja e internetit ose zona e qasjes së internetit është aktive" - "Trokit për ta konfiguruar." - "Ndarja e internetit është çaktivizuar" - "Kontakto me administratorin për detaje" - "Statusi i zonës së qasjes dhe ndarjes së internetit" - - - - - + "Lidhja e çiftimit ose ajo e qasjes në zona publike interneti është aktive" + "Trokit për ta konfiguruar." + "Ndarja e internetit është çaktivizuar" + "Kontakto me administratorin për detaje" + "Statusi i zonës së qasjes dhe ndarjes së internetit" + + + + + diff --git a/Tethering/res/values-sr/strings.xml b/Tethering/res/values-sr/strings.xml index e2e4dc6361..ca3ba5943a 100644 --- a/Tethering/res/values-sr/strings.xml +++ b/Tethering/res/values-sr/strings.xml @@ -16,14 +16,14 @@ - "Привезивање или хотспот је активан" - "Додирните да бисте подесили." - "Привезивање је онемогућено" - "Потражите детаље од администратора" - "Статус хотспота и привезивања" - - - - - + "Активно је привезивање или хотспот" + "Додирните да бисте подесили." + "Привезивање је онемогућено" + "Потражите детаље од администратора" + "Статус хотспота и привезивања" + + + + + diff --git a/Tethering/res/values-sv/strings.xml b/Tethering/res/values-sv/strings.xml index 72702c2858..da5e1044b9 100644 --- a/Tethering/res/values-sv/strings.xml +++ b/Tethering/res/values-sv/strings.xml @@ -16,14 +16,14 @@ - "Internetdelning eller surfzon har aktiverats" - "Tryck om du vill konfigurera." - "Internetdelning har inaktiverats" - "Kontakta administratören om du vill veta mer" - "Trådlös surfzon och internetdelning har inaktiverats" - - - - - + "Internetdelning eller surfzon är aktiv" + "Tryck om du vill konfigurera." + "Internetdelning har inaktiverats" + "Kontakta administratören om du vill veta mer" + "Status för surfzon och internetdelning" + + + + + diff --git a/Tethering/res/values-sw/strings.xml b/Tethering/res/values-sw/strings.xml index 65e4aa8ceb..3e58667263 100644 --- a/Tethering/res/values-sw/strings.xml +++ b/Tethering/res/values-sw/strings.xml @@ -16,14 +16,14 @@ - "Kusambaza mtandao au mtandaopepe umewashwa" - "Gusa ili uweke mipangilio." - "Umezima kipengele cha kusambaza mtandao" - "Wasiliana na msimamizi wako ili upate maelezo zaidi" - "Mtandaopepe na hali ya kusambaza mtandao" - - - - - + "Umewasha kipengele cha kusambaza mtandao au mtandao pepe" + "Gusa ili uweke mipangilio." + "Umezima kipengele cha kusambaza mtandao" + "Wasiliana na msimamizi wako ili upate maelezo zaidi" + "Mtandaopepe na hali ya kusambaza mtandao" + + + + + diff --git a/Tethering/res/values-ta/strings.xml b/Tethering/res/values-ta/strings.xml index 4aba62d4ab..a811e67ece 100644 --- a/Tethering/res/values-ta/strings.xml +++ b/Tethering/res/values-ta/strings.xml @@ -16,14 +16,14 @@ - "டெதெரிங் அல்லது ஹாட்ஸ்பாட் இயங்குகிறது" - "அமைக்க, தட்டவும்." - "டெதெரிங் முடக்கப்பட்டுள்ளது" - "விவரங்களுக்கு உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்" - "ஹாட்ஸ்பாட் & டெதெரிங் நிலை" - - - - - + "இணைப்பு முறை அல்லது ஹாட்ஸ்பாட் செயல்பாட்டில் உள்ளது" + "அமைக்க தட்டவும்." + "இணைப்பு முறை முடக்கப்பட்டுள்ளது" + "விவரங்களுக்கு உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்" + "ஹாட்ஸ்பாட் & இணைப்பு முறை நிலை" + + + + + diff --git a/Tethering/res/values-te/strings.xml b/Tethering/res/values-te/strings.xml index 1f91791341..a92208d1b2 100644 --- a/Tethering/res/values-te/strings.xml +++ b/Tethering/res/values-te/strings.xml @@ -16,14 +16,14 @@ - "టెథరింగ్ లేదా హాట్‌స్పాట్ యాక్టివ్‌గా ఉంది" - "సెటప్ చేయడానికి ట్యాప్ చేయండి." - "టెథరింగ్ డిజేబుల్ చేయబడింది" - "వివరాల కోసం మీ అడ్మిన్‌ని సంప్రదించండి" - "హాట్‌స్పాట్ & టెథరింగ్ స్థితి" - - - - - + "టెథరింగ్ లేదా హాట్‌స్పాట్ యాక్టివ్‌గా ఉంది" + "సెటప్ చేయడానికి ట్యాప్ చేయండి." + "టెథరింగ్ డిజేబుల్ చేయబడింది" + "వివరాల కోసం మీ అడ్మిన్‌ను కాంటాక్ట్ చేయండి" + "హాట్‌స్పాట్ & టెథరింగ్ స్టేటస్" + + + + + diff --git a/Tethering/res/values-th/strings.xml b/Tethering/res/values-th/strings.xml index 44171c0db8..5ebbc802e7 100644 --- a/Tethering/res/values-th/strings.xml +++ b/Tethering/res/values-th/strings.xml @@ -16,14 +16,14 @@ - "การเชื่อมต่ออินเทอร์เน็ตผ่านมือถือหรือฮอตสปอตทำงานอยู่" - "แตะเพื่อตั้งค่า" - "ปิดใช้การเชื่อมต่ออินเทอร์เน็ตผ่านมือถือแล้ว" - "ติดต่อผู้ดูแลระบบเพื่อขอรายละเอียด" - "สถานะฮอตสปอตและการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ" - - - - - + "การเชื่อมต่ออินเทอร์เน็ตผ่านมือถือหรือฮอตสปอตทำงานอยู่" + "แตะเพื่อตั้งค่า" + "การเชื่อมต่ออินเทอร์เน็ตผ่านมือถือปิดอยู่" + "ติดต่อผู้ดูแลระบบเพื่อขอรายละเอียด" + "สถานะฮอตสปอตและการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ" + + + + + diff --git a/Tethering/res/values-tl/strings.xml b/Tethering/res/values-tl/strings.xml index 7347dd3e62..3364e521fc 100644 --- a/Tethering/res/values-tl/strings.xml +++ b/Tethering/res/values-tl/strings.xml @@ -16,14 +16,14 @@ - "Aktibo ang pag-tether o hotspot" - "I-tap para i-set up." - "Naka-disable ang pag-tether" - "Makipag-ugnayan sa iyong admin para sa mga detalye" - "Status ng hotspot at pag-tether" - - - - - + "Aktibo ang pag-tether o hotspot" + "I-tap para i-set up." + "Naka-disable ang pag-tether" + "Makipag-ugnayan sa iyong admin para sa mga detalye" + "Status ng hotspot at pag-tether" + + + + + diff --git a/Tethering/res/values-tr/strings.xml b/Tethering/res/values-tr/strings.xml index 32030f1765..0bb273c107 100644 --- a/Tethering/res/values-tr/strings.xml +++ b/Tethering/res/values-tr/strings.xml @@ -16,14 +16,14 @@ - "Tethering veya hotspot etkin" - "Ayarlamak için dokunun." - "Tethering devre dışı bırakıldı" - "Ayrıntılı bilgi için yöneticinize başvurun" - "Hotspot ve tethering durumu" - - - - - + "Tethering veya hotspot etkin" + "Ayarlamak için dokunun." + "Tethering devre dışı bırakıldı" + "Ayrıntılı bilgi için yöneticinize başvurun" + "Hotspot ve tethering durumu" + + + + + diff --git a/Tethering/res/values-uk/strings.xml b/Tethering/res/values-uk/strings.xml index 1ca89b3f78..11962e5c11 100644 --- a/Tethering/res/values-uk/strings.xml +++ b/Tethering/res/values-uk/strings.xml @@ -16,14 +16,14 @@ - "Модем чи точка доступу активні" - "Натисніть, щоб налаштувати." - "Використання телефона як модема вимкнено" - "Щоб дізнатися більше, зв\'яжіться з адміністратором" - "Статус точки доступу та модема" - - - - - + "Модем чи точка доступу активні" + "Натисніть, щоб налаштувати." + "Використання телефона як модема вимкнено" + "Щоб дізнатися більше, зверніться до адміністратора" + "Статус точки доступу й модема" + + + + + diff --git a/Tethering/res/values-ur/strings.xml b/Tethering/res/values-ur/strings.xml index d72c7d4195..c70e44fd20 100644 --- a/Tethering/res/values-ur/strings.xml +++ b/Tethering/res/values-ur/strings.xml @@ -16,14 +16,14 @@ - "ٹیدرنگ یا ہاٹ اسپاٹ فعال" - "سیٹ اپ کرنے کیلئے تھپتھپائیں۔" - "ٹیدرنگ غیر فعال ہے" - "تفصیلات کے لئے اپنے منتظم سے رابطہ کریں" - "ہاٹ اسپاٹ اور ٹیتھرنگ کا اسٹیٹس" - - - - - + "ٹیدرنگ یا ہاٹ اسپاٹ فعال ہے" + "سیٹ اپ کرنے کیلئے تھپتھپائیں۔" + "ٹیدرنگ غیر فعال ہے" + "تفصیلات کیلئے اپنے منتظم سے رابطہ کریں" + "ہاٹ اسپاٹ اور ٹیتھرنگ کا اسٹیٹس" + + + + + diff --git a/Tethering/res/values-uz/strings.xml b/Tethering/res/values-uz/strings.xml index af3b2ebb35..b315901a04 100644 --- a/Tethering/res/values-uz/strings.xml +++ b/Tethering/res/values-uz/strings.xml @@ -16,14 +16,14 @@ - "Modem rejimi yoki hotspot yoniq" - "Sozlash uchun bosing." - "Modem rejimi faolsizlantirildi" - "Tafsilotlari uchun administratoringizga murojaat qiling" - "Hotspot va modem rejimi holati" - - - - - + "Modem rejimi yoki hotspot yoniq" + "Sozlash uchun bosing." + "Modem rejimi faolsizlantirildi" + "Tafsilotlari uchun administratoringizga murojaat qiling" + "Hotspot va modem rejimi holati" + + + + + diff --git a/Tethering/res/values-vi/strings.xml b/Tethering/res/values-vi/strings.xml index 21a0735922..8e1b91ef2c 100644 --- a/Tethering/res/values-vi/strings.xml +++ b/Tethering/res/values-vi/strings.xml @@ -16,14 +16,14 @@ - "Tính năng chia sẻ Internet hoặc điểm phát sóng đang hoạt động" - "Hãy nhấn để thiết lập." - "Đã tắt tính năng chia sẻ Internet" - "Hãy liên hệ với quản trị viên của bạn để biết chi tiết" - "Trạng thái điểm phát sóng và chia sẻ Internet" - - - - - + "Tính năng chia sẻ Internet hoặc điểm phát sóng đang hoạt động" + "Hãy nhấn để thiết lập." + "Tính năng chia sẻ Internet đã bị tắt" + "Hãy liên hệ với quản trị viên của bạn để biết thông tin chi tiết" + "Trạng thái của chế độ cài đặt \"Điểm phát sóng và chia sẻ Internet\"" + + + + + diff --git a/Tethering/res/values-zh-rCN/strings.xml b/Tethering/res/values-zh-rCN/strings.xml index 98e3b4b46f..054344eae2 100644 --- a/Tethering/res/values-zh-rCN/strings.xml +++ b/Tethering/res/values-zh-rCN/strings.xml @@ -16,14 +16,14 @@ - "网络共享或热点已启用" - "点按即可设置。" - "网络共享已停用" - "如需了解详情，请与您的管理员联系" - "热点和网络共享状态" - - - - - + "网络共享或热点已启用" + "点按即可设置。" + "网络共享已停用" + "如需了解详情，请与您的管理员联系" + "热点和网络共享状态" + + + + + diff --git a/Tethering/res/values-zh-rHK/strings.xml b/Tethering/res/values-zh-rHK/strings.xml index 9cafd42dd4..790d40a300 100644 --- a/Tethering/res/values-zh-rHK/strings.xml +++ b/Tethering/res/values-zh-rHK/strings.xml @@ -16,14 +16,14 @@ - "網絡共享或熱點已啟用" - "輕按即可設定。" - "網絡共享已停用" - "請聯絡您的管理員以瞭解詳情" - "熱點和網絡共享狀態" - - - - - + "網絡共享或熱點已啟用" + "輕按即可設定。" + "網絡共享已停用" + "請聯絡你的管理員以瞭解詳情" + "熱點和網絡共享狀態" + + + + + diff --git a/Tethering/res/values-zh-rTW/strings.xml b/Tethering/res/values-zh-rTW/strings.xml index 50a50bf7a9..65a689e809 100644 --- a/Tethering/res/values-zh-rTW/strings.xml +++ b/Tethering/res/values-zh-rTW/strings.xml @@ -16,14 +16,14 @@ - "網路共用或無線基地台已啟用" - "輕觸即可進行設定。" - "網路共用已停用" - "詳情請洽你的管理員" - "無線基地台與網路共用狀態" - - - - - + "網路共用或無線基地台已啟用" + "輕觸即可設定。" + "網路共用已停用" + "詳情請洽你的管理員" + "無線基地台與網路共用狀態" + + + + + diff --git a/Tethering/res/values-zu/strings.xml b/Tethering/res/values-zu/strings.xml index f210f8726e..e9651dd9b9 100644 --- a/Tethering/res/values-zu/strings.xml +++ b/Tethering/res/values-zu/strings.xml @@ -16,14 +16,14 @@ - "Ukusebenzisa njengemodemu noma i-hotspot ephathekayo kuvuliwe" - "Thepha ukuze usethe." - "Ukusebenzisa ifoni njengemodemu kukhutshaziwe" - "Xhumana nomphathi wakho ukuze uthole imininingwane" - "I-Hotspot nesimo sokusebenzisa ifoni njengemodemu" - - - - - + "Ukusebenzisa njengemodemu noma i-hotspot ephathekayo kuvuliwe" + "Thepha ukuze usethe." + "Ukusebenzisa ifoni njengemodemu kukhutshaziwe" + "Xhumana nomphathi wakho ukuze uthole imininingwane" + "I-Hotspot nesimo sokusebenzisa ifoni njengemodemu" + + + + + From 4ecdedda379e4e9040eb87b01dc3d8efb89be810 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 10 Jan 2024 12:30:41 -0800 Subject: [PATCH 05/19] Baseline NewApi issues NewApi is a lint check that you don't call framework methods that were introduced in versions later than your min_sdk_version. We want to make this an error, so we're baselineing all existing issues. This cl was generated automatically, by taking all the NewApi issues from the reference baselines, and all the non-NewApi issues from the existing checked in baselines. Bug: 268261262 Test: Presubmits Change-Id: I0393f24f101876abc458ca139eefdb279dcb2b03 --- Tethering/Android.bp | 9 +- Tethering/lint-baseline.xml | 4 +- framework/Android.bp | 12 - framework/lint-baseline.xml | 417 ++++++----- nearby/service/lint-baseline.xml | 4 +- service-t/Android.bp | 2 +- service-t/lint-baseline.xml | 345 +++++---- service/Android.bp | 15 +- service/lint-baseline.xml | 1199 +++++++++++++++++++----------- 9 files changed, 1217 insertions(+), 790 deletions(-) diff --git a/Tethering/Android.bp b/Tethering/Android.bp index 73c11baae1..c30e25103d 100644 --- a/Tethering/Android.bp +++ b/Tethering/Android.bp @@ -104,6 +104,7 @@ android_library { lint: { strict_updatability_linting: true, baseline_filename: "lint-baseline.xml", + }, } @@ -122,6 +123,7 @@ android_library { lint: { strict_updatability_linting: true, baseline_filename: "lint-baseline.xml", + }, } @@ -215,7 +217,7 @@ android_app { apex_available: ["com.android.tethering"], lint: { strict_updatability_linting: true, - baseline_filename: "lint-baseline.xml", + }, } @@ -235,7 +237,7 @@ android_app { lint: { strict_updatability_linting: true, error_checks: ["NewApi"], - baseline_filename: "lint-baseline.xml", + }, } @@ -263,9 +265,6 @@ java_library_static { static_libs: ["tetheringprotos"], apex_available: ["com.android.tethering"], min_sdk_version: "30", - lint: { - baseline_filename: "lint-baseline.xml", - }, } genrule { diff --git a/Tethering/lint-baseline.xml b/Tethering/lint-baseline.xml index 37511c682e..4f92c9c2d4 100644 --- a/Tethering/lint-baseline.xml +++ b/Tethering/lint-baseline.xml @@ -1,5 +1,5 @@ - + diff --git a/framework/Android.bp b/framework/Android.bp index f3d8689bed..c00a88f4a1 100644 --- a/framework/Android.bp +++ b/framework/Android.bp @@ -137,9 +137,6 @@ java_library { "framework-wifi.stubs.module_lib", ], visibility: ["//packages/modules/Connectivity:__subpackages__"], - lint: { - baseline_filename: "lint-baseline.xml", - }, } java_defaults { @@ -257,9 +254,6 @@ java_library { apex_available: [ "com.android.tethering", ], - lint: { - baseline_filename: "lint-baseline.xml", - }, } java_genrule { @@ -320,9 +314,6 @@ droidstubs { java_library { name: "framework-connectivity-module-api-stubs-including-flagged", srcs: [":framework-connectivity-module-api-stubs-including-flagged-droidstubs"], - lint: { - baseline_filename: "lint-baseline.xml", - }, } // Library providing limited APIs within the connectivity module, so that R+ components like @@ -347,7 +338,4 @@ java_library { visibility: [ "//packages/modules/Connectivity/Tethering:__subpackages__", ], - lint: { - baseline_filename: "lint-baseline.xml", - }, } diff --git a/framework/lint-baseline.xml b/framework/lint-baseline.xml index f68aad734e..2c0b15fd32 100644 --- a/framework/lint-baseline.xml +++ b/framework/lint-baseline.xml @@ -1,5 +1,5 @@ - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + message="Call requires API level 31 (current min is 30): `libcore.net.http.HttpURLConnectionFactory#openConnection`" + errorLine1=" return urlConnectionFactory.openConnection(url, socketFactory, proxy);" + errorLine2=" ~~~~~~~~~~~~~~"> - - - - - - - - + file="packages/modules/Connectivity/framework/src/android/net/Network.java" + line="372" + column="37"/> + message="Class requires API level 31 (current min is 30): `android.telephony.data.EpsBearerQosSessionAttributes`" + errorLine1=" (EpsBearerQosSessionAttributes)attributes));" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -360,8 +316,63 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~"> + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nearby/service/lint-baseline.xml b/nearby/service/lint-baseline.xml index a4761abb61..3477594c70 100644 --- a/nearby/service/lint-baseline.xml +++ b/nearby/service/lint-baseline.xml @@ -1,5 +1,5 @@ - + diff --git a/service-t/Android.bp b/service-t/Android.bp index de879f303e..78c7d35531 100644 --- a/service-t/Android.bp +++ b/service-t/Android.bp @@ -98,7 +98,7 @@ java_library { min_sdk_version: "21", lint: { error_checks: ["NewApi"], - baseline_filename: "lint-baseline.xml", + }, srcs: [ "src/com/android/server/connectivity/mdns/**/*.java", diff --git a/service-t/lint-baseline.xml b/service-t/lint-baseline.xml index 38d3ab0ce9..7f05b8c657 100644 --- a/service-t/lint-baseline.xml +++ b/service-t/lint-baseline.xml @@ -1,103 +1,15 @@ - + + message="Call requires API level 31 (current min is 30): `BpfMap`" + errorLine1=" return new BpfMap<>(IFACE_INDEX_NAME_MAP_PATH, BpfMap.BPF_F_RDWR," + errorLine2=" ~~~~~~~~~~~~"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + file="packages/modules/Connectivity/service-t/src/com/android/server/net/BpfInterfaceMapUpdater.java" + line="69" + column="24"/> + + + + - - - - - - - - - - - - + + + + + + + + + message="Call requires API level 31 (current min is 30): `java.net.InetAddress#parseNumericAddress`" + errorLine1=" staticIpConfigBuilder.setGateway(InetAddress.parseNumericAddress(value));" + errorLine2=" ~~~~~~~~~~~~~~~~~~~"> + file="packages/modules/Connectivity/service-t/src/com/android/server/ethernet/EthernetTracker.java" + line="885" + column="66"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/service/Android.bp b/service/Android.bp index 7c5da0ddaa..0d7e8d0a87 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -70,9 +70,6 @@ java_library { apex_available: [ "com.android.tethering", ], - lint: { - baseline_filename: "lint-baseline.xml", - }, } // The library name match the service-connectivity jarjar rules that put the JNI utils in the @@ -206,6 +203,7 @@ java_library { lint: { strict_updatability_linting: true, baseline_filename: "lint-baseline.xml", + }, visibility: [ "//packages/modules/Connectivity/service-t", @@ -231,7 +229,7 @@ java_library { ], lint: { strict_updatability_linting: true, - baseline_filename: "lint-baseline.xml", + }, } @@ -290,18 +288,12 @@ java_defaults { java_library { name: "service-connectivity-for-tests", defaults: ["service-connectivity-defaults"], - lint: { - baseline_filename: "lint-baseline.xml", - }, } java_library { name: "service-connectivity", defaults: ["service-connectivity-defaults"], installable: true, - lint: { - baseline_filename: "lint-baseline.xml", - }, } java_library_static { @@ -316,9 +308,6 @@ java_library_static { ], static_libs: ["ConnectivityServiceprotos"], apex_available: ["com.android.tethering"], - lint: { - baseline_filename: "lint-baseline.xml", - }, } genrule { diff --git a/service/lint-baseline.xml b/service/lint-baseline.xml index 5149e6d5d7..a091a2b01e 100644 --- a/service/lint-baseline.xml +++ b/service/lint-baseline.xml @@ -1,5 +1,137 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + message="Call requires API level 33 (current min is 30): `updateUidLockdownRule`" + errorLine1=" mBpfNetMaps.updateUidLockdownRule(uid, add);" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -503,8 +767,107 @@ errorLine2=" ~~~~~~~~~~~~~~~"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 60b21f877f88a6848ee6d0f0e5316362714b9d25 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Tue, 16 Jan 2024 07:48:21 +0000 Subject: [PATCH 06/19] Specify aconfig_declaration modules in java_sdk_library java_sdk_library modules should specify the aconfig_declarations modules in order to generate the exportable stubs (i.e. the stubs that exclude the disabled aconfig flags) by providing the information about the aconfig flag values. The exportable stubs will be used when generating the module sdk snapshots and to generate the hiddenapi flags, in order to prevent exposing the disabled apis in runtime. Test: m framework-connectivity-t Bug: 317290555 Change-Id: Ieb8f41921054ed6f62db2edfc7d695ba0a2a0055 --- framework-t/Android.bp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/framework-t/Android.bp b/framework-t/Android.bp index c31dcf5d9c..b90d99f68f 100644 --- a/framework-t/Android.bp +++ b/framework-t/Android.bp @@ -191,6 +191,9 @@ java_sdk_library { "//packages/modules/NetworkStack/tests:__subpackages__", "//packages/modules/Wifi/service/tests/wifitests", ], + aconfig_declarations: [ + "com.android.net.flags-aconfig", + ], } // This rule is not used anymore(b/268440216). From cb11d58ed40b4d4d17571f67051ff67a7d734d51 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Thu, 18 Jan 2024 11:36:48 -0800 Subject: [PATCH 07/19] Remove strict_updatability_linting: true strict_updatability_linting has been disabled for a while now, due to an expansion in scope of the NewApi check. We're going to re-enable it now, but doing so requires removing it from all modules that have baselined NewApi issues. Bug: 320698986 Test: Presubmits Change-Id: Id6c9202c236f33ad89615e4d5fa5a6364147841a --- Tethering/Android.bp | 17 ----------------- framework/Android.bp | 3 --- service/Android.bp | 4 ---- 3 files changed, 24 deletions(-) diff --git a/Tethering/Android.bp b/Tethering/Android.bp index c30e25103d..ae3530542a 100644 --- a/Tethering/Android.bp +++ b/Tethering/Android.bp @@ -81,10 +81,6 @@ java_defaults { "framework-tethering.impl", ], manifest: "AndroidManifestBase.xml", - lint: { - strict_updatability_linting: true, - error_checks: ["NewApi"], - }, } // build tethering static library, used to compile both variants of the tethering. @@ -102,9 +98,7 @@ android_library { ], apex_available: ["com.android.tethering"], lint: { - strict_updatability_linting: true, baseline_filename: "lint-baseline.xml", - }, } @@ -121,9 +115,7 @@ android_library { ], apex_available: ["com.android.tethering"], lint: { - strict_updatability_linting: true, baseline_filename: "lint-baseline.xml", - }, } @@ -197,9 +189,6 @@ java_defaults { optimize: { proguard_flags_files: ["proguard.flags"], }, - lint: { - strict_updatability_linting: true, - }, } // Updatable tethering packaged for finalized API @@ -215,10 +204,6 @@ android_app { use_embedded_native_libs: true, privapp_allowlist: ":privapp_allowlist_com.android.tethering", apex_available: ["com.android.tethering"], - lint: { - strict_updatability_linting: true, - - }, } android_app { @@ -235,9 +220,7 @@ android_app { privapp_allowlist: ":privapp_allowlist_com.android.tethering", apex_available: ["com.android.tethering"], lint: { - strict_updatability_linting: true, error_checks: ["NewApi"], - }, } diff --git a/framework/Android.bp b/framework/Android.bp index c00a88f4a1..5c35ab2fca 100644 --- a/framework/Android.bp +++ b/framework/Android.bp @@ -105,9 +105,6 @@ java_defaults { apex_available: [ "com.android.tethering", ], - lint: { - strict_updatability_linting: true, - }, } java_library { diff --git a/service/Android.bp b/service/Android.bp index 0d7e8d0a87..ab85cc1078 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -201,7 +201,6 @@ java_library { "com.android.tethering", ], lint: { - strict_updatability_linting: true, baseline_filename: "lint-baseline.xml", }, @@ -273,9 +272,6 @@ java_defaults { optimize: { proguard_flags_files: ["proguard.flags"], }, - lint: { - strict_updatability_linting: true, - }, } // A special library created strictly for use by the tests as they need the From 8c7f1f071807be5bad03f7ea5c351b0539206a82 Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Thu, 11 Jan 2024 19:24:20 -0800 Subject: [PATCH 08/19] Refactoring hostside network restrictions tests The definition of background can be fluid and ambiguous. Refactored all code to be explicit about process states when making assertions. No functional change is expected to tests. Test: atest CtsHostsideNetworkTests Bug: 304347838 Change-Id: Ibc614d74f46d436cad4586c1d309bbb3648b8eb1 Merged-In: Ibc614d74f46d436cad4586c1d309bbb3648b8eb1 --- .../AbstractBatterySaverModeTestCase.java | 6 +- .../hostside/AbstractDozeModeTestCase.java | 8 +- ...ractRestrictBackgroundNetworkTestCase.java | 145 +++++++----------- .../net/hostside/ConnOnActivityStartTest.java | 4 +- .../cts/net/hostside/DataSaverModeTest.java | 6 +- .../cts/net/hostside/NetworkCallbackTest.java | 7 +- .../hostside/NetworkPolicyManagerTest.java | 9 +- .../cts/net/hostside/RestrictedModeTest.java | 4 +- 8 files changed, 81 insertions(+), 108 deletions(-) diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractBatterySaverModeTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractBatterySaverModeTestCase.java index 04d054d54a..0d7365f786 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractBatterySaverModeTestCase.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractBatterySaverModeTestCase.java @@ -59,13 +59,13 @@ abstract class AbstractBatterySaverModeTestCase extends AbstractRestrictBackgrou setBatterySaverMode(false); launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_ACTIVTIY); setBatterySaverMode(true); - assertForegroundNetworkAccess(); + assertTopNetworkAccess(true); // Although it should not have access while the screen is off. turnScreenOff(); assertBackgroundNetworkAccess(false); turnScreenOn(); - assertForegroundNetworkAccess(); + assertTopNetworkAccess(true); // Goes back to background state. finishActivity(); @@ -75,7 +75,7 @@ abstract class AbstractBatterySaverModeTestCase extends AbstractRestrictBackgrou setBatterySaverMode(false); launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_FOREGROUND_SERVICE); setBatterySaverMode(true); - assertForegroundNetworkAccess(); + assertForegroundServiceNetworkAccess(); stopForegroundService(); assertBackgroundNetworkAccess(false); } diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractDozeModeTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractDozeModeTestCase.java index e0ce4ead39..b03795321a 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractDozeModeTestCase.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractDozeModeTestCase.java @@ -16,6 +16,8 @@ package com.android.cts.net.hostside; +import static android.app.ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE; + import static com.android.cts.net.hostside.Property.DOZE_MODE; import static com.android.cts.net.hostside.Property.NOT_LOW_RAM_DEVICE; @@ -62,9 +64,9 @@ abstract class AbstractDozeModeTestCase extends AbstractRestrictBackgroundNetwor setDozeMode(false); launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_FOREGROUND_SERVICE); setDozeMode(true); - assertForegroundNetworkAccess(); + assertForegroundServiceNetworkAccess(); stopForegroundService(); - assertBackgroundState(); + assertProcessStateBelow(PROCESS_STATE_BOUND_FOREGROUND_SERVICE); assertBackgroundNetworkAccess(false); } @@ -136,6 +138,6 @@ abstract class AbstractDozeModeTestCase extends AbstractRestrictBackgroundNetwor protected void assertsForegroundAlwaysHasNetworkAccess() throws Exception { launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_FOREGROUND_SERVICE); stopForegroundService(); - assertBackgroundState(); + assertProcessStateBelow(PROCESS_STATE_BOUND_FOREGROUND_SERVICE); } } diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java index 198b009be6..29aac3c566 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java @@ -16,6 +16,9 @@ package com.android.cts.net.hostside; +import static android.app.ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE; +import static android.app.ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE; +import static android.app.ActivityManager.PROCESS_STATE_TOP; import static android.app.job.JobScheduler.RESULT_SUCCESS; import static android.net.ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED; import static android.os.BatteryManager.BATTERY_PLUGGED_ANY; @@ -38,7 +41,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import android.annotation.NonNull; -import android.app.ActivityManager; import android.app.Instrumentation; import android.app.NotificationManager; import android.app.job.JobInfo; @@ -67,6 +69,7 @@ import androidx.annotation.Nullable; import com.android.compatibility.common.util.AmUtils; import com.android.compatibility.common.util.BatteryUtils; import com.android.compatibility.common.util.DeviceConfigStateHelper; +import com.android.compatibility.common.util.ThrowingRunnable; import org.junit.Rule; import org.junit.rules.RuleChain; @@ -76,6 +79,7 @@ import java.util.ArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; +import java.util.function.Predicate; /** * Superclass for tests related to background network restrictions. @@ -126,8 +130,6 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { private static final int SECOND_IN_MS = 1000; static final int NETWORK_TIMEOUT_MS = 15 * SECOND_IN_MS; - private static int PROCESS_STATE_FOREGROUND_SERVICE; - private static final String KEY_NETWORK_STATE_OBSERVER = TEST_PKG + ".observer"; private static final String KEY_SKIP_VALIDATION_CHECKS = TEST_PKG + ".skip_validation_checks"; @@ -171,9 +173,6 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { .around(new MeterednessConfigurationRule()); protected void setUp() throws Exception { - // TODO: Annotate these constants with @TestApi instead of obtaining them using reflection - PROCESS_STATE_FOREGROUND_SERVICE = (Integer) ActivityManager.class - .getDeclaredField("PROCESS_STATE_FOREGROUND_SERVICE").get(null); mInstrumentation = getInstrumentation(); mContext = getContext(); mCm = getConnectivityManager(); @@ -284,44 +283,20 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { restrictBackgroundValueToString(Integer.parseInt(status))); } - protected void assertBackgroundNetworkAccess(boolean expectAllowed) throws Exception { - assertBackgroundNetworkAccess(expectAllowed, null); - } - /** - * Asserts whether the active network is available or not for the background app. If the network - * is unavailable, also checks whether it is blocked by the expected error. - * - * @param expectAllowed expect background network access to be allowed or not. - * @param expectedUnavailableError the expected error when {@code expectAllowed} is false. It's - * meaningful only when the {@code expectAllowed} is 'false'. - * Throws an IllegalArgumentException when {@code expectAllowed} - * is true and this parameter is not null. When the - * {@code expectAllowed} is 'false' and this parameter is null, - * this function does not compare error type of the networking - * access failure. + * @deprecated The definition of "background" can be ambiguous. Use separate calls to + * {@link #assertProcessStateBelow(int)} with + * {@link #assertNetworkAccess(boolean, boolean, String)} to be explicit, instead. */ - protected void assertBackgroundNetworkAccess(boolean expectAllowed, - @Nullable final String expectedUnavailableError) throws Exception { - assertBackgroundState(); - if (expectAllowed && expectedUnavailableError != null) { - throw new IllegalArgumentException("expectedUnavailableError is not null"); - } - assertNetworkAccess(expectAllowed /* expectAvailable */, false /* needScreenOn */, - expectedUnavailableError); + @Deprecated + protected void assertBackgroundNetworkAccess(boolean expectAllowed) throws Exception { + assertProcessStateBelow(PROCESS_STATE_BOUND_FOREGROUND_SERVICE); + assertNetworkAccess(expectAllowed, false, null); } - protected void assertForegroundNetworkAccess() throws Exception { - assertForegroundNetworkAccess(true); - } - - protected void assertForegroundNetworkAccess(boolean expectAllowed) throws Exception { - assertForegroundState(); - // We verified that app is in foreground state but if the screen turns-off while - // verifying for network access, the app will go into background state (in case app's - // foreground status was due to top activity). So, turn the screen on when verifying - // network connectivity. - assertNetworkAccess(expectAllowed /* expectAvailable */, true /* needScreenOn */); + protected void assertTopNetworkAccess(boolean expectAllowed) throws Exception { + assertTopState(); + assertNetworkAccess(expectAllowed, true /* needScreenOn */); } protected void assertForegroundServiceNetworkAccess() throws Exception { @@ -355,75 +330,65 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { finishExpeditedJob(); } - protected final void assertBackgroundState() throws Exception { - final int maxTries = 30; - ProcessState state = null; - for (int i = 1; i <= maxTries; i++) { - state = getProcessStateByUid(mUid); - Log.v(TAG, "assertBackgroundState(): status for app2 (" + mUid + ") on attempt #" + i - + ": " + state); - if (isBackground(state.state)) { - return; - } - Log.d(TAG, "App not on background state (" + state + ") on attempt #" + i - + "; sleeping 1s before trying again"); - // No sleep after the last turn - if (i < maxTries) { - SystemClock.sleep(SECOND_IN_MS); - } - } - fail("App2 (" + mUid + ") is not on background state after " - + maxTries + " attempts: " + state); + /** + * Asserts that the process state of the test app is below, in priority, to the given + * {@link android.app.ActivityManager.ProcessState}. + */ + protected final void assertProcessStateBelow(int processState) throws Exception { + assertProcessState(ps -> ps.state > processState, null); } - protected final void assertForegroundState() throws Exception { - final int maxTries = 30; - ProcessState state = null; - for (int i = 1; i <= maxTries; i++) { - state = getProcessStateByUid(mUid); - Log.v(TAG, "assertForegroundState(): status for app2 (" + mUid + ") on attempt #" + i - + ": " + state); - if (!isBackground(state.state)) { - return; - } - Log.d(TAG, "App not on foreground state on attempt #" + i - + "; sleeping 1s before trying again"); - turnScreenOn(); - // No sleep after the last turn - if (i < maxTries) { - SystemClock.sleep(SECOND_IN_MS); - } - } - fail("App2 (" + mUid + ") is not on foreground state after " - + maxTries + " attempts: " + state); + protected final void assertTopState() throws Exception { + assertProcessState(ps -> ps.state == PROCESS_STATE_TOP, () -> turnScreenOn()); } protected final void assertForegroundServiceState() throws Exception { + assertProcessState(ps -> ps.state == PROCESS_STATE_FOREGROUND_SERVICE, null); + } + + private void assertProcessState(Predicate statePredicate, + ThrowingRunnable onRetry) throws Exception { final int maxTries = 30; ProcessState state = null; for (int i = 1; i <= maxTries; i++) { + if (onRetry != null) { + onRetry.run(); + } state = getProcessStateByUid(mUid); - Log.v(TAG, "assertForegroundServiceState(): status for app2 (" + mUid + ") on attempt #" - + i + ": " + state); - if (state.state == PROCESS_STATE_FOREGROUND_SERVICE) { + Log.v(TAG, "assertProcessState(): status for app2 (" + mUid + ") on attempt #" + i + + ": " + state); + if (statePredicate.test(state)) { return; } - Log.d(TAG, "App not on foreground service state on attempt #" + i + Log.i(TAG, "App not in desired process state on attempt #" + i + "; sleeping 1s before trying again"); - // No sleep after the last turn if (i < maxTries) { SystemClock.sleep(SECOND_IN_MS); } } - fail("App2 (" + mUid + ") is not on foreground service state after " - + maxTries + " attempts: " + state); + fail("App2 (" + mUid + ") is not in the desired process state after " + maxTries + + " attempts: " + state); } /** - * Returns whether an app state should be considered "background" for restriction purposes. + * Asserts whether the active network is available or not. If the network is unavailable, also + * checks whether it is blocked by the expected error. + * + * @param expectAllowed expect background network access to be allowed or not. + * @param expectedUnavailableError the expected error when {@code expectAllowed} is false. It's + * meaningful only when the {@code expectAllowed} is 'false'. + * Throws an IllegalArgumentException when {@code expectAllowed} + * is true and this parameter is not null. When the + * {@code expectAllowed} is 'false' and this parameter is null, + * this function does not compare error type of the networking + * access failure. */ - protected boolean isBackground(int state) { - return state > PROCESS_STATE_FOREGROUND_SERVICE; + protected void assertNetworkAccess(boolean expectAllowed, String expectedUnavailableError) + throws Exception { + if (expectAllowed && expectedUnavailableError != null) { + throw new IllegalArgumentException("expectedUnavailableError is not null"); + } + assertNetworkAccess(expectAllowed, false, expectedUnavailableError); } /** @@ -958,7 +923,7 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { } else if (resultCode == INetworkStateObserver.RESULT_ERROR_UNEXPECTED_PROC_STATE) { Log.d(TAG, resultData); // App didn't come to foreground when the activity is started, so try again. - assertForegroundNetworkAccess(); + assertTopNetworkAccess(true); } else { fail("Unexpected resultCode=" + resultCode + "; received=[" + resultData + "]"); } diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnOnActivityStartTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnOnActivityStartTest.java index 10775d02ec..4004789c6c 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnOnActivityStartTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnOnActivityStartTest.java @@ -17,6 +17,8 @@ package com.android.cts.net.hostside; +import static android.app.ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE; + import static com.android.cts.net.hostside.NetworkPolicyTestUtils.getUiDevice; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.setRestrictBackground; import static com.android.cts.net.hostside.Property.APP_STANDBY_MODE; @@ -95,7 +97,7 @@ public class ConnOnActivityStartTest extends AbstractRestrictBackgroundNetworkTe Log.i(TAG, testName + " start #" + i); launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_ACTIVTIY); getUiDevice().pressHome(); - assertBackgroundState(); + assertProcessStateBelow(PROCESS_STATE_BOUND_FOREGROUND_SERVICE); Log.i(TAG, testName + " end #" + i); } } diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/DataSaverModeTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/DataSaverModeTest.java index 2f30536922..790e03124f 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/DataSaverModeTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/DataSaverModeTest.java @@ -108,7 +108,7 @@ public class DataSaverModeTest extends AbstractRestrictBackgroundNetworkTestCase setRestrictBackground(false); launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_ACTIVTIY); setRestrictBackground(true); - assertForegroundNetworkAccess(); + assertTopNetworkAccess(true); // Although it should not have access while the screen is off. turnScreenOff(); @@ -119,7 +119,7 @@ public class DataSaverModeTest extends AbstractRestrictBackgroundNetworkTestCase if (isTV()) { startActivity(); } - assertForegroundNetworkAccess(); + assertTopNetworkAccess(true); // Goes back to background state. finishActivity(); @@ -129,7 +129,7 @@ public class DataSaverModeTest extends AbstractRestrictBackgroundNetworkTestCase setRestrictBackground(false); launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_FOREGROUND_SERVICE); setRestrictBackground(true); - assertForegroundNetworkAccess(); + assertForegroundServiceNetworkAccess(); stopForegroundService(); assertBackgroundNetworkAccess(false); } diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java index ab956bfc7a..eb2347da2e 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java @@ -16,6 +16,7 @@ package com.android.cts.net.hostside; +import static android.app.ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED; import static android.net.NetworkCapabilities.SIGNAL_STRENGTH_UNSPECIFIED; @@ -313,7 +314,8 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa // Enable Power Saver setBatterySaverMode(true); if (SdkLevel.isAtLeastT()) { - assertBackgroundNetworkAccess(false, "java.net.UnknownHostException"); + assertProcessStateBelow(PROCESS_STATE_BOUND_FOREGROUND_SERVICE); + assertNetworkAccess(false, "java.net.UnknownHostException"); } else { assertBackgroundNetworkAccess(false); } @@ -337,7 +339,8 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa // Enable Power Saver setBatterySaverMode(true); if (SdkLevel.isAtLeastT()) { - assertBackgroundNetworkAccess(false, "java.net.UnknownHostException"); + assertProcessStateBelow(PROCESS_STATE_BOUND_FOREGROUND_SERVICE); + assertNetworkAccess(false, "java.net.UnknownHostException"); } else { assertBackgroundNetworkAccess(false); } diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyManagerTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyManagerTest.java index a0d88c949d..7aeca77178 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyManagerTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyManagerTest.java @@ -16,6 +16,7 @@ package com.android.cts.net.hostside; +import static android.app.ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE; import static android.os.Process.SYSTEM_UID; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.assertIsUidRestrictedOnMeteredNetworks; @@ -137,13 +138,13 @@ public class NetworkPolicyManagerTest extends AbstractRestrictBackgroundNetworkT // Make TEST_APP2_PKG go to foreground and mUid will be allowed temporarily. launchActivity(); - assertForegroundState(); + assertTopState(); assertNetworkingBlockedStatusForUid(mUid, METERED, false /* expectedResult */); // Match NTWK_ALLOWED_TMP_ALLOWLIST // Back to background. finishActivity(); - assertBackgroundState(); + assertProcessStateBelow(PROCESS_STATE_BOUND_FOREGROUND_SERVICE); assertNetworkingBlockedStatusForUid(mUid, METERED, true /* expectedResult */); // Match NTWK_BLOCKED_BG_RESTRICT } finally { @@ -219,11 +220,11 @@ public class NetworkPolicyManagerTest extends AbstractRestrictBackgroundNetworkT // Make TEST_APP2_PKG go to foreground and isUidRestrictedOnMeteredNetworks() will // return false. launchActivity(); - assertForegroundState(); + assertTopState(); assertIsUidRestrictedOnMeteredNetworks(mUid, false /* expectedResult */); // Back to background. finishActivity(); - assertBackgroundState(); + assertProcessStateBelow(PROCESS_STATE_BOUND_FOREGROUND_SERVICE); // Add mUid into restrict background whitelist and isUidRestrictedOnMeteredNetworks() // will return false. diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/RestrictedModeTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/RestrictedModeTest.java index 35f1f1cf51..4777bf4be3 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/RestrictedModeTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/RestrictedModeTest.java @@ -38,7 +38,7 @@ public final class RestrictedModeTest extends AbstractRestrictBackgroundNetworkT // go to foreground state and enable restricted mode launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_ACTIVTIY); setRestrictedNetworkingMode(true); - assertForegroundNetworkAccess(false); + assertTopNetworkAccess(false); // go to background state finishActivity(); @@ -47,7 +47,7 @@ public final class RestrictedModeTest extends AbstractRestrictBackgroundNetworkT // disable restricted mode and assert network access in foreground and background states setRestrictedNetworkingMode(false); launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_ACTIVTIY); - assertForegroundNetworkAccess(true); + assertTopNetworkAccess(true); // go to background state finishActivity(); From a10d9668ebfad24242fa562245f54cccdd355748 Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Fri, 19 Jan 2024 15:22:28 -0800 Subject: [PATCH 09/19] CTS for default background network restrictions Apps will now lose network access once they are in top-sleeping or higher process state. Adding some cts tests to ensure correct behavior. Test: atest CtsHostsideNetworkTests BYPASS_INCLUSIVE_LANGUAGE_REASON=Existing method Bug: 304347838 Change-Id: Iba7c7bd01309fa7a301fdc1524033f0fad5ae512 --- tests/cts/hostside/Android.bp | 5 +- tests/cts/hostside/app/Android.bp | 7 +- .../AbstractDefaultRestrictionsTest.java | 96 ++++++++++++++++ ...ractRestrictBackgroundNetworkTestCase.java | 22 +++- .../net/hostside/ConnOnActivityStartTest.java | 29 ++++- .../DefaultRestrictionsMeteredTest.java | 23 ++++ .../DefaultRestrictionsNonMeteredTest.java | 23 ++++ .../cts/net/hostside/MyServiceClient.java | 41 +++++-- .../cts/net/hostside/NetworkCallbackTest.java | 72 +++++++++++- .../hostside/NetworkPolicyManagerTest.java | 34 ++++++ .../instrumentation_arguments/Android.bp | 22 ++++ .../arguments/InstrumentationArguments.java | 21 ++++ .../net/HostsideConnOnActivityStartTest.java | 12 ++ ...stsideDefaultNetworkRestrictionsTests.java | 103 ++++++++++++++++++ .../cts/net/HostsideNetworkCallbackTests.java | 11 ++ .../HostsideNetworkPolicyManagerTests.java | 12 ++ .../cts/net/HostsideNetworkTestCase.java | 14 +++ 17 files changed, 521 insertions(+), 26 deletions(-) create mode 100644 tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractDefaultRestrictionsTest.java create mode 100644 tests/cts/hostside/app/src/com/android/cts/net/hostside/DefaultRestrictionsMeteredTest.java create mode 100644 tests/cts/hostside/app/src/com/android/cts/net/hostside/DefaultRestrictionsNonMeteredTest.java create mode 100644 tests/cts/hostside/instrumentation_arguments/Android.bp create mode 100644 tests/cts/hostside/instrumentation_arguments/src/com/android/cts/net/arguments/InstrumentationArguments.java create mode 100644 tests/cts/hostside/src/com/android/cts/net/HostsideDefaultNetworkRestrictionsTests.java diff --git a/tests/cts/hostside/Android.bp b/tests/cts/hostside/Android.bp index a0aafc642a..eb5b27179c 100644 --- a/tests/cts/hostside/Android.bp +++ b/tests/cts/hostside/Android.bp @@ -30,7 +30,10 @@ java_test_host { name: "CtsHostsideNetworkTests", defaults: ["cts_defaults"], // Only compile source java files in this apk. - srcs: ["src/**/*.java"], + srcs: [ + "src/**/*.java", + ":ArgumentConstants", + ], libs: [ "net-tests-utils-host-device-common", "cts-tradefed", diff --git a/tests/cts/hostside/app/Android.bp b/tests/cts/hostside/app/Android.bp index 470bb17a02..8981fa3199 100644 --- a/tests/cts/hostside/app/Android.bp +++ b/tests/cts/hostside/app/Android.bp @@ -30,12 +30,17 @@ java_defaults { "cts-net-utils", "ctstestrunner-axt", "modules-utils-build", + "flag-junit", + "net_flags_lib", ], libs: [ "android.test.runner", "android.test.base", ], - srcs: ["src/**/*.java"], + srcs: [ + "src/**/*.java", + ":ArgumentConstants", + ], // Tag this module as a cts test artifact test_suites: [ "general-tests", diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractDefaultRestrictionsTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractDefaultRestrictionsTest.java new file mode 100644 index 0000000000..4667c09e53 --- /dev/null +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractDefaultRestrictionsTest.java @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.cts.net.hostside; + +import static android.app.ActivityManager.PROCESS_STATE_TOP_SLEEPING; + +import android.os.SystemClock; +import android.platform.test.annotations.RequiresFlagsEnabled; + +import com.android.server.net.Flags; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +/** + * Base class for default, always-on network restrictions. + */ +abstract class AbstractDefaultRestrictionsTest extends AbstractRestrictBackgroundNetworkTestCase { + + @Before + public final void setUp() throws Exception { + super.setUp(); + + removePowerSaveModeWhitelist(TEST_APP2_PKG); + removePowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG); + + registerBroadcastReceiver(); + } + + @After + public final void tearDown() throws Exception { + super.tearDown(); + + removePowerSaveModeWhitelist(TEST_APP2_PKG); + removePowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG); + } + + @Test + @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE) + public void testFgsNetworkAccess() throws Exception { + assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); + SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); + assertNetworkAccess(false, null); + + launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_FOREGROUND_SERVICE); + } + + @Test + @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE) + public void testActivityNetworkAccess() throws Exception { + assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); + SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); + assertNetworkAccess(false, null); + + launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_ACTIVTIY); + } + + @Test + @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE) + public void testBackgroundNetworkAccess_inFullAllowlist() throws Exception { + assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); + SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); + assertNetworkAccess(false, null); + + addPowerSaveModeWhitelist(TEST_APP2_PKG); + assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); + assertNetworkAccess(true, null); + } + + @Test + @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE) + public void testBackgroundNetworkAccess_inExceptIdleAllowlist() throws Exception { + assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); + SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); + assertNetworkAccess(false, null); + + addPowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG); + assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); + assertNetworkAccess(true, null); + } +} diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java index 29aac3c566..0a015086ee 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java @@ -23,6 +23,7 @@ import static android.app.job.JobScheduler.RESULT_SUCCESS; import static android.net.ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED; import static android.os.BatteryManager.BATTERY_PLUGGED_ANY; +import static com.android.cts.net.arguments.InstrumentationArguments.ARG_WAIVE_BIND_PRIORITY; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.executeShellCommand; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.forceRunJob; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.getConnectivityManager; @@ -59,12 +60,14 @@ import android.os.Bundle; import android.os.PowerManager; import android.os.RemoteCallback; import android.os.SystemClock; +import android.platform.test.flag.junit.DeviceFlagsValueProvider; import android.provider.DeviceConfig; import android.service.notification.NotificationListenerService; import android.util.Log; import android.util.Pair; import androidx.annotation.Nullable; +import androidx.test.platform.app.InstrumentationRegistry; import com.android.compatibility.common.util.AmUtils; import com.android.compatibility.common.util.BatteryUtils; @@ -90,6 +93,8 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { protected static final String TEST_PKG = "com.android.cts.net.hostside"; protected static final String TEST_APP2_PKG = "com.android.cts.net.hostside.app2"; + // TODO(b/321797685): Configure it via device-config once it is available. + protected static final long PROCESS_STATE_TRANSITION_DELAY_MS = TimeUnit.SECONDS.toMillis(5); private static final String TEST_APP2_ACTIVITY_CLASS = TEST_APP2_PKG + ".MyActivity"; private static final String TEST_APP2_SERVICE_CLASS = TEST_APP2_PKG + ".MyForegroundService"; @@ -97,7 +102,6 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { private static final ComponentName TEST_JOB_COMPONENT = new ComponentName( TEST_APP2_PKG, TEST_APP2_JOB_SERVICE_CLASS); - private static final int TEST_JOB_ID = 7357437; private static final int SLEEP_TIME_SEC = 1; @@ -152,8 +156,6 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { private static final IntentFilter BATTERY_CHANGED_FILTER = new IntentFilter(Intent.ACTION_BATTERY_CHANGED); - private static final String APP_NOT_FOREGROUND_ERROR = "app_not_fg"; - protected static final long TEMP_POWERSAVE_WHITELIST_DURATION_MS = 20_000; // 20 sec private static final long BROADCAST_TIMEOUT_MS = 5_000; @@ -170,7 +172,8 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { @Rule public final RuleChain mRuleChain = RuleChain.outerRule(new RequiredPropertiesRule()) - .around(new MeterednessConfigurationRule()); + .around(new MeterednessConfigurationRule()) + .around(DeviceFlagsValueProvider.createCheckFlagsRule()); protected void setUp() throws Exception { mInstrumentation = getInstrumentation(); @@ -181,7 +184,16 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { mUid = getUid(TEST_APP2_PKG); mMyUid = getUid(mContext.getPackageName()); mServiceClient = new MyServiceClient(mContext); - mServiceClient.bind(); + + final Bundle args = InstrumentationRegistry.getArguments(); + final int bindPriorityFlags; + if (Boolean.valueOf(args.getString(ARG_WAIVE_BIND_PRIORITY, "false"))) { + bindPriorityFlags = Context.BIND_WAIVE_PRIORITY; + } else { + bindPriorityFlags = Context.BIND_NOT_FOREGROUND; + } + mServiceClient.bind(bindPriorityFlags); + mPowerManager = mContext.getSystemService(PowerManager.class); executeShellCommand("cmd netpolicy start-watching " + mUid); // Some of the test cases assume that Data saver mode is initially disabled, which might not diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnOnActivityStartTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnOnActivityStartTest.java index 4004789c6c..c2cf1395cf 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnOnActivityStartTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnOnActivityStartTest.java @@ -18,6 +18,7 @@ package com.android.cts.net.hostside; import static android.app.ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE; +import static android.app.ActivityManager.PROCESS_STATE_TOP_SLEEPING; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.getUiDevice; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.setRestrictBackground; @@ -28,8 +29,13 @@ import static com.android.cts.net.hostside.Property.DOZE_MODE; import static com.android.cts.net.hostside.Property.METERED_NETWORK; import static com.android.cts.net.hostside.Property.NON_METERED_NETWORK; +import android.os.SystemClock; +import android.platform.test.annotations.RequiresFlagsEnabled; import android.util.Log; +import com.android.compatibility.common.util.ThrowingRunnable; +import com.android.server.net.Flags; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -63,14 +69,14 @@ public class ConnOnActivityStartTest extends AbstractRestrictBackgroundNetworkTe @RequiredProperties({BATTERY_SAVER_MODE}) public void testStartActivity_batterySaver() throws Exception { setBatterySaverMode(true); - assertLaunchedActivityHasNetworkAccess("testStartActivity_batterySaver"); + assertLaunchedActivityHasNetworkAccess("testStartActivity_batterySaver", null); } @Test @RequiredProperties({DATA_SAVER_MODE, METERED_NETWORK}) public void testStartActivity_dataSaver() throws Exception { setRestrictBackground(true); - assertLaunchedActivityHasNetworkAccess("testStartActivity_dataSaver"); + assertLaunchedActivityHasNetworkAccess("testStartActivity_dataSaver", null); } @Test @@ -79,7 +85,7 @@ public class ConnOnActivityStartTest extends AbstractRestrictBackgroundNetworkTe setDozeMode(true); // TODO (235284115): We need to turn on Doze every time before starting // the activity. - assertLaunchedActivityHasNetworkAccess("testStartActivity_doze"); + assertLaunchedActivityHasNetworkAccess("testStartActivity_doze", null); } @Test @@ -89,11 +95,24 @@ public class ConnOnActivityStartTest extends AbstractRestrictBackgroundNetworkTe setAppIdle(true); // TODO (235284115): We need to put the app into app standby mode every // time before starting the activity. - assertLaunchedActivityHasNetworkAccess("testStartActivity_appStandby"); + assertLaunchedActivityHasNetworkAccess("testStartActivity_appStandby", null); } - private void assertLaunchedActivityHasNetworkAccess(String testName) throws Exception { + @Test + @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE) + public void testStartActivity_default() throws Exception { + assertLaunchedActivityHasNetworkAccess("testStartActivity_default", () -> { + assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); + SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); + }); + } + + private void assertLaunchedActivityHasNetworkAccess(String testName, + ThrowingRunnable onBeginIteration) throws Exception { for (int i = 0; i < TEST_ITERATION_COUNT; ++i) { + if (onBeginIteration != null) { + onBeginIteration.run(); + } Log.i(TAG, testName + " start #" + i); launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_ACTIVTIY); getUiDevice().pressHome(); diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/DefaultRestrictionsMeteredTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/DefaultRestrictionsMeteredTest.java new file mode 100644 index 0000000000..f3a1026261 --- /dev/null +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/DefaultRestrictionsMeteredTest.java @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.cts.net.hostside; + +import static com.android.cts.net.hostside.Property.METERED_NETWORK; + +@RequiredProperties({METERED_NETWORK}) +public class DefaultRestrictionsMeteredTest extends AbstractDefaultRestrictionsTest { +} diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/DefaultRestrictionsNonMeteredTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/DefaultRestrictionsNonMeteredTest.java new file mode 100644 index 0000000000..5651dd05c7 --- /dev/null +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/DefaultRestrictionsNonMeteredTest.java @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.cts.net.hostside; + +import static com.android.cts.net.hostside.Property.NON_METERED_NETWORK; + +@RequiredProperties({NON_METERED_NETWORK}) +public class DefaultRestrictionsNonMeteredTest extends AbstractDefaultRestrictionsTest { +} diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/MyServiceClient.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/MyServiceClient.java index 93cc91125a..980ecd5df6 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/MyServiceClient.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/MyServiceClient.java @@ -34,26 +34,30 @@ public class MyServiceClient { private Context mContext; private ServiceConnection mServiceConnection; - private IMyService mService; + private volatile IMyService mService; + private final ConditionVariable mServiceCondition = new ConditionVariable(); public MyServiceClient(Context context) { mContext = context; } - public void bind() { + /** + * Binds to a service in the test app to communicate state. + * @param bindPriorityFlags Flags to influence the process-state of the bound app. + */ + public void bind(int bindPriorityFlags) { if (mService != null) { throw new IllegalStateException("Already bound"); } - - final ConditionVariable cv = new ConditionVariable(); mServiceConnection = new ServiceConnection() { @Override public void onServiceConnected(ComponentName name, IBinder service) { mService = IMyService.Stub.asInterface(service); - cv.open(); + mServiceCondition.open(); } @Override public void onServiceDisconnected(ComponentName name) { + mServiceCondition.close(); mService = null; } }; @@ -63,12 +67,8 @@ public class MyServiceClient { // Needs to use BIND_NOT_FOREGROUND so app2 does not run in // the same process state as app mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE - | Context.BIND_NOT_FOREGROUND); - cv.block(TIMEOUT_MS); - if (mService == null) { - throw new IllegalStateException( - "Could not bind to MyService service after " + TIMEOUT_MS + "ms"); - } + | bindPriorityFlags); + ensureServiceConnection(); } public void unbind() { @@ -77,37 +77,56 @@ public class MyServiceClient { } } + private void ensureServiceConnection() { + if (mService != null) { + return; + } + mServiceCondition.block(TIMEOUT_MS); + if (mService == null) { + throw new IllegalStateException( + "Could not bind to MyService service after " + TIMEOUT_MS + "ms"); + } + } + public void registerBroadcastReceiver() throws RemoteException { + ensureServiceConnection(); mService.registerBroadcastReceiver(); } public int getCounters(String receiverName, String action) throws RemoteException { + ensureServiceConnection(); return mService.getCounters(receiverName, action); } public String checkNetworkStatus() throws RemoteException { + ensureServiceConnection(); return mService.checkNetworkStatus(); } public String getRestrictBackgroundStatus() throws RemoteException { + ensureServiceConnection(); return mService.getRestrictBackgroundStatus(); } public void sendNotification(int notificationId, String notificationType) throws RemoteException { + ensureServiceConnection(); mService.sendNotification(notificationId, notificationType); } public void registerNetworkCallback(final NetworkRequest request, INetworkCallback cb) throws RemoteException { + ensureServiceConnection(); mService.registerNetworkCallback(request, cb); } public void unregisterNetworkCallback() throws RemoteException { + ensureServiceConnection(); mService.unregisterNetworkCallback(); } public int scheduleJob(JobInfo jobInfo) throws RemoteException { + ensureServiceConnection(); return mService.scheduleJob(jobInfo); } } diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java index eb2347da2e..ec2645b465 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java @@ -17,6 +17,7 @@ package com.android.cts.net.hostside; import static android.app.ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE; +import static android.app.ActivityManager.PROCESS_STATE_TOP_SLEEPING; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED; import static android.net.NetworkCapabilities.SIGNAL_STRENGTH_UNSPECIFIED; @@ -34,15 +35,19 @@ import android.net.Network; import android.net.NetworkCapabilities; import android.net.NetworkRequest; import android.net.cts.util.CtsNetUtils; +import android.os.SystemClock; +import android.platform.test.annotations.RequiresFlagsEnabled; import android.util.Log; import com.android.modules.utils.build.SdkLevel; +import com.android.server.net.Flags; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import java.util.ArrayList; import java.util.Objects; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; @@ -145,12 +150,22 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa public Network expectAvailableCallbackAndGetNetwork() { final CallbackInfo cb = nextCallback(TEST_CONNECT_TIMEOUT_MS); if (cb.state != CallbackState.AVAILABLE) { - fail("Network is not available. Instead obtained the following callback :" - + cb); + fail("Network is not available. Instead obtained the following callback :" + cb); } return cb.network; } + public void drainAndWaitForIdle() { + try { + do { + mCallbacks.drainTo(new ArrayList<>()); + } while (mCallbacks.poll(TEST_CALLBACK_TIMEOUT_MS, TimeUnit.MILLISECONDS) != null); + } catch (InterruptedException ie) { + Log.e(TAG, "Interrupted while draining callback queue", ie); + Thread.currentThread().interrupt(); + } + } + public void expectBlockedStatusCallback(Network expectedNetwork, boolean expectBlocked) { expectCallback(CallbackState.BLOCKED_STATUS, expectedNetwork, expectBlocked); } @@ -225,7 +240,7 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa // Check that the network is metered. mTestNetworkCallback.expectCapabilitiesCallbackEventually(mNetwork, false /* hasCapability */, NET_CAPABILITY_NOT_METERED); - mTestNetworkCallback.expectBlockedStatusCallback(mNetwork, false); + mTestNetworkCallback.drainAndWaitForIdle(); // Before Android T, DNS queries over private DNS should be but are not restricted by Power // Saver or Data Saver. The issue is fixed in mainline update and apps can no longer request @@ -357,6 +372,57 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa } } + @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE) + @Test + public void testOnBlockedStatusChanged_default() throws Exception { + try { + assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); + assertNetworkAccess(false, null); + assertNetworkAccessBlockedByBpf(true, mUid, true /* metered */); + + launchActivity(); + assertTopState(); + assertNetworkAccess(true, null); + mTestNetworkCallback.expectBlockedStatusCallbackEventually(mNetwork, false); + assertNetworkAccessBlockedByBpf(false, mUid, true /* metered */); + + finishActivity(); + assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); + SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); + assertNetworkAccess(false, null); + mTestNetworkCallback.expectBlockedStatusCallbackEventually(mNetwork, true); + assertNetworkAccessBlockedByBpf(true, mUid, true /* metered */); + + } finally { + mMeterednessConfiguration.resetNetworkMeteredness(); + } + + // Set to non-metered network + mMeterednessConfiguration.configureNetworkMeteredness(false); + mTestNetworkCallback.expectCapabilitiesCallbackEventually(mNetwork, + true /* hasCapability */, NET_CAPABILITY_NOT_METERED); + try { + assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); + assertNetworkAccess(false, null); + assertNetworkAccessBlockedByBpf(true, mUid, false /* metered */); + + launchActivity(); + assertTopState(); + assertNetworkAccess(true, null); + mTestNetworkCallback.expectBlockedStatusCallbackEventually(mNetwork, false); + assertNetworkAccessBlockedByBpf(false, mUid, false /* metered */); + + finishActivity(); + assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); + SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); + assertNetworkAccess(false, null); + mTestNetworkCallback.expectBlockedStatusCallbackEventually(mNetwork, true); + assertNetworkAccessBlockedByBpf(true, mUid, false /* metered */); + } finally { + mMeterednessConfiguration.resetNetworkMeteredness(); + } + } + // TODO: 1. test against VPN lockdown. // 2. test against multiple networks. } diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyManagerTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyManagerTest.java index 7aeca77178..6d46f73b30 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyManagerTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyManagerTest.java @@ -17,6 +17,7 @@ package com.android.cts.net.hostside; import static android.app.ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE; +import static android.app.ActivityManager.PROCESS_STATE_TOP_SLEEPING; import static android.os.Process.SYSTEM_UID; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.assertIsUidRestrictedOnMeteredNetworks; @@ -29,6 +30,11 @@ import static com.android.cts.net.hostside.Property.DATA_SAVER_MODE; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import android.os.SystemClock; +import android.platform.test.annotations.RequiresFlagsEnabled; + +import com.android.server.net.Flags; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -238,4 +244,32 @@ public class NetworkPolicyManagerTest extends AbstractRestrictBackgroundNetworkT assertIsUidRestrictedOnMeteredNetworks(mUid, false /* expectedResult */); } } + + @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE) + @Test + public void testIsUidNetworkingBlocked_whenInBackground() throws Exception { + try { + assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); + SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); + assertNetworkingBlockedStatusForUid(mUid, METERED, true /* expectedResult */); + assertTrue(isUidNetworkingBlocked(mUid, NON_METERED)); + + launchActivity(); + assertTopState(); + assertNetworkingBlockedStatusForUid(mUid, METERED, false /* expectedResult */); + assertFalse(isUidNetworkingBlocked(mUid, NON_METERED)); + + finishActivity(); + assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); + SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); + assertNetworkingBlockedStatusForUid(mUid, METERED, true /* expectedResult */); + assertTrue(isUidNetworkingBlocked(mUid, NON_METERED)); + + addPowerSaveModeWhitelist(TEST_APP2_PKG); + assertNetworkingBlockedStatusForUid(mUid, METERED, false /* expectedResult */); + assertFalse(isUidNetworkingBlocked(mUid, NON_METERED)); + } finally { + removePowerSaveModeWhitelist(TEST_APP2_PKG); + } + } } diff --git a/tests/cts/hostside/instrumentation_arguments/Android.bp b/tests/cts/hostside/instrumentation_arguments/Android.bp new file mode 100644 index 0000000000..cdede36627 --- /dev/null +++ b/tests/cts/hostside/instrumentation_arguments/Android.bp @@ -0,0 +1,22 @@ +// Copyright (C) 2024 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + +filegroup { + name: "ArgumentConstants", + srcs: ["src/**/*.java"], +} diff --git a/tests/cts/hostside/instrumentation_arguments/src/com/android/cts/net/arguments/InstrumentationArguments.java b/tests/cts/hostside/instrumentation_arguments/src/com/android/cts/net/arguments/InstrumentationArguments.java new file mode 100644 index 0000000000..472e347c1d --- /dev/null +++ b/tests/cts/hostside/instrumentation_arguments/src/com/android/cts/net/arguments/InstrumentationArguments.java @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.cts.net.arguments; + +public interface InstrumentationArguments { + String ARG_WAIVE_BIND_PRIORITY = "waive_bind_priority"; +} diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideConnOnActivityStartTest.java b/tests/cts/hostside/src/com/android/cts/net/HostsideConnOnActivityStartTest.java index 849ac7ca72..880e826322 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideConnOnActivityStartTest.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideConnOnActivityStartTest.java @@ -16,6 +16,8 @@ package com.android.cts.net; +import static com.android.cts.net.arguments.InstrumentationArguments.ARG_WAIVE_BIND_PRIORITY; + import android.platform.test.annotations.FlakyTest; import com.android.testutils.SkipPresubmit; @@ -26,9 +28,12 @@ import com.android.tradefed.testtype.junit4.BeforeClassWithInfo; import org.junit.Test; +import java.util.Map; + @SkipPresubmit(reason = "Out of SLO flakiness") public class HostsideConnOnActivityStartTest extends HostsideNetworkTestCase { private static final String TEST_CLASS = TEST_PKG + ".ConnOnActivityStartTest"; + @BeforeClassWithInfo public static void setUpOnce(TestInformation testInfo) throws Exception { uninstallPackage(testInfo, TEST_APP2_PKG, false); @@ -60,4 +65,11 @@ public class HostsideConnOnActivityStartTest extends HostsideNetworkTestCase { public void testStartActivity_appStandby() throws Exception { runDeviceTests(TEST_PKG, TEST_CLASS, "testStartActivity_appStandby"); } + + // TODO(b/321848487): Annotate with @RequiresFlagsEnabled to mirror the device-side test. + @Test + public void testStartActivity_default() throws Exception { + runDeviceTestsWithArgs(TEST_PKG, TEST_CLASS, "testStartActivity_default", + Map.of(ARG_WAIVE_BIND_PRIORITY, "true")); + } } diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideDefaultNetworkRestrictionsTests.java b/tests/cts/hostside/src/com/android/cts/net/HostsideDefaultNetworkRestrictionsTests.java new file mode 100644 index 0000000000..0d01fc12af --- /dev/null +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideDefaultNetworkRestrictionsTests.java @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.cts.net; + +import static com.android.cts.net.arguments.InstrumentationArguments.ARG_WAIVE_BIND_PRIORITY; + +import com.android.testutils.SkipPresubmit; +import com.android.tradefed.device.DeviceNotAvailableException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import java.util.Map; + +// TODO(b/321848487): Annotate with @RequiresFlagsEnabled to mirror the device-side tests. +@SkipPresubmit(reason = "Monitoring for flakiness") +public class HostsideDefaultNetworkRestrictionsTests extends HostsideNetworkTestCase { + private static final String METERED_TEST_CLASS = TEST_PKG + ".DefaultRestrictionsMeteredTest"; + private static final String NON_METERED_TEST_CLASS = + TEST_PKG + ".DefaultRestrictionsNonMeteredTest"; + + @Before + public void setUp() throws Exception { + uninstallPackage(TEST_APP2_PKG, false); + installPackage(TEST_APP2_APK); + } + + @After + public void tearDown() throws Exception { + uninstallPackage(TEST_APP2_PKG, true); + } + + private void runMeteredTest(String methodName) throws DeviceNotAvailableException { + runDeviceTestsWithArgs(TEST_PKG, METERED_TEST_CLASS, methodName, + Map.of(ARG_WAIVE_BIND_PRIORITY, "true")); + } + + private void runNonMeteredTest(String methodName) throws DeviceNotAvailableException { + runDeviceTestsWithArgs(TEST_PKG, NON_METERED_TEST_CLASS, methodName, + Map.of(ARG_WAIVE_BIND_PRIORITY, "true")); + } + + @Test + public void testMeteredNetworkAccess_defaultRestrictions_testActivityNetworkAccess() + throws Exception { + runMeteredTest("testActivityNetworkAccess"); + } + + @Test + public void testMeteredNetworkAccess_defaultRestrictions_testFgsNetworkAccess() + throws Exception { + runMeteredTest("testFgsNetworkAccess"); + } + + @Test + public void testMeteredNetworkAccess_defaultRestrictions_inFullAllowlist() throws Exception { + runMeteredTest("testBackgroundNetworkAccess_inFullAllowlist"); + } + + @Test + public void testMeteredNetworkAccess_defaultRestrictions_inExceptIdleAllowlist() + throws Exception { + runMeteredTest("testBackgroundNetworkAccess_inExceptIdleAllowlist"); + } + + @Test + public void testNonMeteredNetworkAccess_defaultRestrictions_testActivityNetworkAccess() + throws Exception { + runNonMeteredTest("testActivityNetworkAccess"); + } + + @Test + public void testNonMeteredNetworkAccess_defaultRestrictions_testFgsNetworkAccess() + throws Exception { + runNonMeteredTest("testFgsNetworkAccess"); + } + + @Test + public void testNonMeteredNetworkAccess_defaultRestrictions_inFullAllowlist() throws Exception { + runNonMeteredTest("testBackgroundNetworkAccess_inFullAllowlist"); + } + + @Test + public void testNonMeteredNetworkAccess_defaultRestrictions_inExceptIdleAllowlist() + throws Exception { + runNonMeteredTest("testBackgroundNetworkAccess_inExceptIdleAllowlist"); + } +} diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java index 04bd1ad4d2..361f7c7d0b 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java @@ -15,12 +15,16 @@ */ package com.android.cts.net; +import static com.android.cts.net.arguments.InstrumentationArguments.ARG_WAIVE_BIND_PRIORITY; + import com.android.testutils.SkipPresubmit; import org.junit.After; import org.junit.Before; import org.junit.Test; +import java.util.Map; + @SkipPresubmit(reason = "Out of SLO flakiness") public class HostsideNetworkCallbackTests extends HostsideNetworkTestCase { @@ -46,5 +50,12 @@ public class HostsideNetworkCallbackTests extends HostsideNetworkTestCase { runDeviceTests(TEST_PKG, TEST_PKG + ".NetworkCallbackTest", "testOnBlockedStatusChanged_powerSaver"); } + + // TODO(b/321848487): Annotate with @RequiresFlagsEnabled to mirror the device-side test. + @Test + public void testOnBlockedStatusChanged_default() throws Exception { + runDeviceTestsWithArgs(TEST_PKG, TEST_PKG + ".NetworkCallbackTest", + "testOnBlockedStatusChanged_default", Map.of(ARG_WAIVE_BIND_PRIORITY, "true")); + } } diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkPolicyManagerTests.java b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkPolicyManagerTests.java index 3ddb88b70f..e97db58a42 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkPolicyManagerTests.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkPolicyManagerTests.java @@ -16,10 +16,14 @@ package com.android.cts.net; +import static com.android.cts.net.arguments.InstrumentationArguments.ARG_WAIVE_BIND_PRIORITY; + import org.junit.After; import org.junit.Before; import org.junit.Test; +import java.util.Map; + public class HostsideNetworkPolicyManagerTests extends HostsideNetworkTestCase { @Before public void setUp() throws Exception { @@ -71,4 +75,12 @@ public class HostsideNetworkPolicyManagerTests extends HostsideNetworkTestCase { runDeviceTests(TEST_PKG, TEST_PKG + ".NetworkPolicyManagerTest", "testIsUidRestrictedOnMeteredNetworks"); } + + // TODO(b/321848487): Annotate with @RequiresFlagsEnabled to mirror the device-side test. + @Test + public void testIsUidNetworkingBlocked_whenInBackground() throws Exception { + runDeviceTestsWithArgs(TEST_PKG, TEST_PKG + ".NetworkPolicyManagerTest", + "testIsUidNetworkingBlocked_whenInBackground", + Map.of(ARG_WAIVE_BIND_PRIORITY, "true")); + } } diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java index 3358fd7a6d..ca95ed6e46 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java @@ -31,10 +31,13 @@ import com.android.tradefed.testtype.DeviceJUnit4ClassRunner; import com.android.tradefed.testtype.junit4.AfterClassWithInfo; import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test; import com.android.tradefed.testtype.junit4.BeforeClassWithInfo; +import com.android.tradefed.testtype.junit4.DeviceTestRunOptions; import com.android.tradefed.util.RunUtil; import org.junit.runner.RunWith; +import java.util.Map; + @RunWith(DeviceJUnit4ClassRunner.class) abstract class HostsideNetworkTestCase extends BaseHostJUnit4Test { protected static final boolean DEBUG = false; @@ -146,6 +149,17 @@ abstract class HostsideNetworkTestCase extends BaseHostJUnit4Test { + packageName + ", u=" + currentUser); } + protected boolean runDeviceTestsWithArgs(String packageName, String className, + String methodName, Map args) throws DeviceNotAvailableException { + final DeviceTestRunOptions deviceTestRunOptions = new DeviceTestRunOptions(packageName) + .setTestClassName(className) + .setTestMethodName(methodName); + for (Map.Entry arg : args.entrySet()) { + deviceTestRunOptions.addInstrumentationArg(arg.getKey(), arg.getValue()); + } + return runDeviceTests(deviceTestRunOptions); + } + protected String runCommand(String command) throws DeviceNotAvailableException { Log.d(TAG, "Command: '" + command + "'"); final String output = getDevice().executeShellCommand(command); From 2318155f93118983d33c31ecc230e4c673d2ff3f Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Wed, 24 Jan 2024 08:13:26 +0000 Subject: [PATCH 10/19] Revert "CTS for default background network restrictions" This reverts commit a10d9668ebfad24242fa562245f54cccdd355748. Reason for revert: AOSP change cannot merge due to downstream merge problems: The aconfig dependencies of this change in frameworks/base can not be made available in udc-mainline-prod. Bug: 322115994 Change-Id: Ie9fb0a92f0fadb07f5933e1b74e84d343047c81c --- tests/cts/hostside/Android.bp | 5 +- tests/cts/hostside/app/Android.bp | 7 +- .../AbstractDefaultRestrictionsTest.java | 96 ---------------- ...ractRestrictBackgroundNetworkTestCase.java | 22 +--- .../net/hostside/ConnOnActivityStartTest.java | 29 +---- .../DefaultRestrictionsMeteredTest.java | 23 ---- .../DefaultRestrictionsNonMeteredTest.java | 23 ---- .../cts/net/hostside/MyServiceClient.java | 41 ++----- .../cts/net/hostside/NetworkCallbackTest.java | 72 +----------- .../hostside/NetworkPolicyManagerTest.java | 34 ------ .../instrumentation_arguments/Android.bp | 22 ---- .../arguments/InstrumentationArguments.java | 21 ---- .../net/HostsideConnOnActivityStartTest.java | 12 -- ...stsideDefaultNetworkRestrictionsTests.java | 103 ------------------ .../cts/net/HostsideNetworkCallbackTests.java | 11 -- .../HostsideNetworkPolicyManagerTests.java | 12 -- .../cts/net/HostsideNetworkTestCase.java | 14 --- 17 files changed, 26 insertions(+), 521 deletions(-) delete mode 100644 tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractDefaultRestrictionsTest.java delete mode 100644 tests/cts/hostside/app/src/com/android/cts/net/hostside/DefaultRestrictionsMeteredTest.java delete mode 100644 tests/cts/hostside/app/src/com/android/cts/net/hostside/DefaultRestrictionsNonMeteredTest.java delete mode 100644 tests/cts/hostside/instrumentation_arguments/Android.bp delete mode 100644 tests/cts/hostside/instrumentation_arguments/src/com/android/cts/net/arguments/InstrumentationArguments.java delete mode 100644 tests/cts/hostside/src/com/android/cts/net/HostsideDefaultNetworkRestrictionsTests.java diff --git a/tests/cts/hostside/Android.bp b/tests/cts/hostside/Android.bp index eb5b27179c..a0aafc642a 100644 --- a/tests/cts/hostside/Android.bp +++ b/tests/cts/hostside/Android.bp @@ -30,10 +30,7 @@ java_test_host { name: "CtsHostsideNetworkTests", defaults: ["cts_defaults"], // Only compile source java files in this apk. - srcs: [ - "src/**/*.java", - ":ArgumentConstants", - ], + srcs: ["src/**/*.java"], libs: [ "net-tests-utils-host-device-common", "cts-tradefed", diff --git a/tests/cts/hostside/app/Android.bp b/tests/cts/hostside/app/Android.bp index 8981fa3199..470bb17a02 100644 --- a/tests/cts/hostside/app/Android.bp +++ b/tests/cts/hostside/app/Android.bp @@ -30,17 +30,12 @@ java_defaults { "cts-net-utils", "ctstestrunner-axt", "modules-utils-build", - "flag-junit", - "net_flags_lib", ], libs: [ "android.test.runner", "android.test.base", ], - srcs: [ - "src/**/*.java", - ":ArgumentConstants", - ], + srcs: ["src/**/*.java"], // Tag this module as a cts test artifact test_suites: [ "general-tests", diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractDefaultRestrictionsTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractDefaultRestrictionsTest.java deleted file mode 100644 index 4667c09e53..0000000000 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractDefaultRestrictionsTest.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.cts.net.hostside; - -import static android.app.ActivityManager.PROCESS_STATE_TOP_SLEEPING; - -import android.os.SystemClock; -import android.platform.test.annotations.RequiresFlagsEnabled; - -import com.android.server.net.Flags; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * Base class for default, always-on network restrictions. - */ -abstract class AbstractDefaultRestrictionsTest extends AbstractRestrictBackgroundNetworkTestCase { - - @Before - public final void setUp() throws Exception { - super.setUp(); - - removePowerSaveModeWhitelist(TEST_APP2_PKG); - removePowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG); - - registerBroadcastReceiver(); - } - - @After - public final void tearDown() throws Exception { - super.tearDown(); - - removePowerSaveModeWhitelist(TEST_APP2_PKG); - removePowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG); - } - - @Test - @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE) - public void testFgsNetworkAccess() throws Exception { - assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); - SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); - assertNetworkAccess(false, null); - - launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_FOREGROUND_SERVICE); - } - - @Test - @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE) - public void testActivityNetworkAccess() throws Exception { - assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); - SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); - assertNetworkAccess(false, null); - - launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_ACTIVTIY); - } - - @Test - @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE) - public void testBackgroundNetworkAccess_inFullAllowlist() throws Exception { - assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); - SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); - assertNetworkAccess(false, null); - - addPowerSaveModeWhitelist(TEST_APP2_PKG); - assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); - assertNetworkAccess(true, null); - } - - @Test - @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE) - public void testBackgroundNetworkAccess_inExceptIdleAllowlist() throws Exception { - assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); - SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); - assertNetworkAccess(false, null); - - addPowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG); - assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); - assertNetworkAccess(true, null); - } -} diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java index 0a015086ee..29aac3c566 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java @@ -23,7 +23,6 @@ import static android.app.job.JobScheduler.RESULT_SUCCESS; import static android.net.ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED; import static android.os.BatteryManager.BATTERY_PLUGGED_ANY; -import static com.android.cts.net.arguments.InstrumentationArguments.ARG_WAIVE_BIND_PRIORITY; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.executeShellCommand; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.forceRunJob; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.getConnectivityManager; @@ -60,14 +59,12 @@ import android.os.Bundle; import android.os.PowerManager; import android.os.RemoteCallback; import android.os.SystemClock; -import android.platform.test.flag.junit.DeviceFlagsValueProvider; import android.provider.DeviceConfig; import android.service.notification.NotificationListenerService; import android.util.Log; import android.util.Pair; import androidx.annotation.Nullable; -import androidx.test.platform.app.InstrumentationRegistry; import com.android.compatibility.common.util.AmUtils; import com.android.compatibility.common.util.BatteryUtils; @@ -93,8 +90,6 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { protected static final String TEST_PKG = "com.android.cts.net.hostside"; protected static final String TEST_APP2_PKG = "com.android.cts.net.hostside.app2"; - // TODO(b/321797685): Configure it via device-config once it is available. - protected static final long PROCESS_STATE_TRANSITION_DELAY_MS = TimeUnit.SECONDS.toMillis(5); private static final String TEST_APP2_ACTIVITY_CLASS = TEST_APP2_PKG + ".MyActivity"; private static final String TEST_APP2_SERVICE_CLASS = TEST_APP2_PKG + ".MyForegroundService"; @@ -102,6 +97,7 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { private static final ComponentName TEST_JOB_COMPONENT = new ComponentName( TEST_APP2_PKG, TEST_APP2_JOB_SERVICE_CLASS); + private static final int TEST_JOB_ID = 7357437; private static final int SLEEP_TIME_SEC = 1; @@ -156,6 +152,8 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { private static final IntentFilter BATTERY_CHANGED_FILTER = new IntentFilter(Intent.ACTION_BATTERY_CHANGED); + private static final String APP_NOT_FOREGROUND_ERROR = "app_not_fg"; + protected static final long TEMP_POWERSAVE_WHITELIST_DURATION_MS = 20_000; // 20 sec private static final long BROADCAST_TIMEOUT_MS = 5_000; @@ -172,8 +170,7 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { @Rule public final RuleChain mRuleChain = RuleChain.outerRule(new RequiredPropertiesRule()) - .around(new MeterednessConfigurationRule()) - .around(DeviceFlagsValueProvider.createCheckFlagsRule()); + .around(new MeterednessConfigurationRule()); protected void setUp() throws Exception { mInstrumentation = getInstrumentation(); @@ -184,16 +181,7 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { mUid = getUid(TEST_APP2_PKG); mMyUid = getUid(mContext.getPackageName()); mServiceClient = new MyServiceClient(mContext); - - final Bundle args = InstrumentationRegistry.getArguments(); - final int bindPriorityFlags; - if (Boolean.valueOf(args.getString(ARG_WAIVE_BIND_PRIORITY, "false"))) { - bindPriorityFlags = Context.BIND_WAIVE_PRIORITY; - } else { - bindPriorityFlags = Context.BIND_NOT_FOREGROUND; - } - mServiceClient.bind(bindPriorityFlags); - + mServiceClient.bind(); mPowerManager = mContext.getSystemService(PowerManager.class); executeShellCommand("cmd netpolicy start-watching " + mUid); // Some of the test cases assume that Data saver mode is initially disabled, which might not diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnOnActivityStartTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnOnActivityStartTest.java index c2cf1395cf..4004789c6c 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnOnActivityStartTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnOnActivityStartTest.java @@ -18,7 +18,6 @@ package com.android.cts.net.hostside; import static android.app.ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE; -import static android.app.ActivityManager.PROCESS_STATE_TOP_SLEEPING; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.getUiDevice; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.setRestrictBackground; @@ -29,13 +28,8 @@ import static com.android.cts.net.hostside.Property.DOZE_MODE; import static com.android.cts.net.hostside.Property.METERED_NETWORK; import static com.android.cts.net.hostside.Property.NON_METERED_NETWORK; -import android.os.SystemClock; -import android.platform.test.annotations.RequiresFlagsEnabled; import android.util.Log; -import com.android.compatibility.common.util.ThrowingRunnable; -import com.android.server.net.Flags; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -69,14 +63,14 @@ public class ConnOnActivityStartTest extends AbstractRestrictBackgroundNetworkTe @RequiredProperties({BATTERY_SAVER_MODE}) public void testStartActivity_batterySaver() throws Exception { setBatterySaverMode(true); - assertLaunchedActivityHasNetworkAccess("testStartActivity_batterySaver", null); + assertLaunchedActivityHasNetworkAccess("testStartActivity_batterySaver"); } @Test @RequiredProperties({DATA_SAVER_MODE, METERED_NETWORK}) public void testStartActivity_dataSaver() throws Exception { setRestrictBackground(true); - assertLaunchedActivityHasNetworkAccess("testStartActivity_dataSaver", null); + assertLaunchedActivityHasNetworkAccess("testStartActivity_dataSaver"); } @Test @@ -85,7 +79,7 @@ public class ConnOnActivityStartTest extends AbstractRestrictBackgroundNetworkTe setDozeMode(true); // TODO (235284115): We need to turn on Doze every time before starting // the activity. - assertLaunchedActivityHasNetworkAccess("testStartActivity_doze", null); + assertLaunchedActivityHasNetworkAccess("testStartActivity_doze"); } @Test @@ -95,24 +89,11 @@ public class ConnOnActivityStartTest extends AbstractRestrictBackgroundNetworkTe setAppIdle(true); // TODO (235284115): We need to put the app into app standby mode every // time before starting the activity. - assertLaunchedActivityHasNetworkAccess("testStartActivity_appStandby", null); + assertLaunchedActivityHasNetworkAccess("testStartActivity_appStandby"); } - @Test - @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE) - public void testStartActivity_default() throws Exception { - assertLaunchedActivityHasNetworkAccess("testStartActivity_default", () -> { - assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); - SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); - }); - } - - private void assertLaunchedActivityHasNetworkAccess(String testName, - ThrowingRunnable onBeginIteration) throws Exception { + private void assertLaunchedActivityHasNetworkAccess(String testName) throws Exception { for (int i = 0; i < TEST_ITERATION_COUNT; ++i) { - if (onBeginIteration != null) { - onBeginIteration.run(); - } Log.i(TAG, testName + " start #" + i); launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_ACTIVTIY); getUiDevice().pressHome(); diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/DefaultRestrictionsMeteredTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/DefaultRestrictionsMeteredTest.java deleted file mode 100644 index f3a1026261..0000000000 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/DefaultRestrictionsMeteredTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.cts.net.hostside; - -import static com.android.cts.net.hostside.Property.METERED_NETWORK; - -@RequiredProperties({METERED_NETWORK}) -public class DefaultRestrictionsMeteredTest extends AbstractDefaultRestrictionsTest { -} diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/DefaultRestrictionsNonMeteredTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/DefaultRestrictionsNonMeteredTest.java deleted file mode 100644 index 5651dd05c7..0000000000 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/DefaultRestrictionsNonMeteredTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.cts.net.hostside; - -import static com.android.cts.net.hostside.Property.NON_METERED_NETWORK; - -@RequiredProperties({NON_METERED_NETWORK}) -public class DefaultRestrictionsNonMeteredTest extends AbstractDefaultRestrictionsTest { -} diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/MyServiceClient.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/MyServiceClient.java index 980ecd5df6..93cc91125a 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/MyServiceClient.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/MyServiceClient.java @@ -34,30 +34,26 @@ public class MyServiceClient { private Context mContext; private ServiceConnection mServiceConnection; - private volatile IMyService mService; - private final ConditionVariable mServiceCondition = new ConditionVariable(); + private IMyService mService; public MyServiceClient(Context context) { mContext = context; } - /** - * Binds to a service in the test app to communicate state. - * @param bindPriorityFlags Flags to influence the process-state of the bound app. - */ - public void bind(int bindPriorityFlags) { + public void bind() { if (mService != null) { throw new IllegalStateException("Already bound"); } + + final ConditionVariable cv = new ConditionVariable(); mServiceConnection = new ServiceConnection() { @Override public void onServiceConnected(ComponentName name, IBinder service) { mService = IMyService.Stub.asInterface(service); - mServiceCondition.open(); + cv.open(); } @Override public void onServiceDisconnected(ComponentName name) { - mServiceCondition.close(); mService = null; } }; @@ -67,8 +63,12 @@ public class MyServiceClient { // Needs to use BIND_NOT_FOREGROUND so app2 does not run in // the same process state as app mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE - | bindPriorityFlags); - ensureServiceConnection(); + | Context.BIND_NOT_FOREGROUND); + cv.block(TIMEOUT_MS); + if (mService == null) { + throw new IllegalStateException( + "Could not bind to MyService service after " + TIMEOUT_MS + "ms"); + } } public void unbind() { @@ -77,56 +77,37 @@ public class MyServiceClient { } } - private void ensureServiceConnection() { - if (mService != null) { - return; - } - mServiceCondition.block(TIMEOUT_MS); - if (mService == null) { - throw new IllegalStateException( - "Could not bind to MyService service after " + TIMEOUT_MS + "ms"); - } - } - public void registerBroadcastReceiver() throws RemoteException { - ensureServiceConnection(); mService.registerBroadcastReceiver(); } public int getCounters(String receiverName, String action) throws RemoteException { - ensureServiceConnection(); return mService.getCounters(receiverName, action); } public String checkNetworkStatus() throws RemoteException { - ensureServiceConnection(); return mService.checkNetworkStatus(); } public String getRestrictBackgroundStatus() throws RemoteException { - ensureServiceConnection(); return mService.getRestrictBackgroundStatus(); } public void sendNotification(int notificationId, String notificationType) throws RemoteException { - ensureServiceConnection(); mService.sendNotification(notificationId, notificationType); } public void registerNetworkCallback(final NetworkRequest request, INetworkCallback cb) throws RemoteException { - ensureServiceConnection(); mService.registerNetworkCallback(request, cb); } public void unregisterNetworkCallback() throws RemoteException { - ensureServiceConnection(); mService.unregisterNetworkCallback(); } public int scheduleJob(JobInfo jobInfo) throws RemoteException { - ensureServiceConnection(); return mService.scheduleJob(jobInfo); } } diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java index ec2645b465..eb2347da2e 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java @@ -17,7 +17,6 @@ package com.android.cts.net.hostside; import static android.app.ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE; -import static android.app.ActivityManager.PROCESS_STATE_TOP_SLEEPING; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED; import static android.net.NetworkCapabilities.SIGNAL_STRENGTH_UNSPECIFIED; @@ -35,19 +34,15 @@ import android.net.Network; import android.net.NetworkCapabilities; import android.net.NetworkRequest; import android.net.cts.util.CtsNetUtils; -import android.os.SystemClock; -import android.platform.test.annotations.RequiresFlagsEnabled; import android.util.Log; import com.android.modules.utils.build.SdkLevel; -import com.android.server.net.Flags; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import java.util.ArrayList; import java.util.Objects; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; @@ -150,22 +145,12 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa public Network expectAvailableCallbackAndGetNetwork() { final CallbackInfo cb = nextCallback(TEST_CONNECT_TIMEOUT_MS); if (cb.state != CallbackState.AVAILABLE) { - fail("Network is not available. Instead obtained the following callback :" + cb); + fail("Network is not available. Instead obtained the following callback :" + + cb); } return cb.network; } - public void drainAndWaitForIdle() { - try { - do { - mCallbacks.drainTo(new ArrayList<>()); - } while (mCallbacks.poll(TEST_CALLBACK_TIMEOUT_MS, TimeUnit.MILLISECONDS) != null); - } catch (InterruptedException ie) { - Log.e(TAG, "Interrupted while draining callback queue", ie); - Thread.currentThread().interrupt(); - } - } - public void expectBlockedStatusCallback(Network expectedNetwork, boolean expectBlocked) { expectCallback(CallbackState.BLOCKED_STATUS, expectedNetwork, expectBlocked); } @@ -240,7 +225,7 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa // Check that the network is metered. mTestNetworkCallback.expectCapabilitiesCallbackEventually(mNetwork, false /* hasCapability */, NET_CAPABILITY_NOT_METERED); - mTestNetworkCallback.drainAndWaitForIdle(); + mTestNetworkCallback.expectBlockedStatusCallback(mNetwork, false); // Before Android T, DNS queries over private DNS should be but are not restricted by Power // Saver or Data Saver. The issue is fixed in mainline update and apps can no longer request @@ -372,57 +357,6 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa } } - @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE) - @Test - public void testOnBlockedStatusChanged_default() throws Exception { - try { - assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); - assertNetworkAccess(false, null); - assertNetworkAccessBlockedByBpf(true, mUid, true /* metered */); - - launchActivity(); - assertTopState(); - assertNetworkAccess(true, null); - mTestNetworkCallback.expectBlockedStatusCallbackEventually(mNetwork, false); - assertNetworkAccessBlockedByBpf(false, mUid, true /* metered */); - - finishActivity(); - assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); - SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); - assertNetworkAccess(false, null); - mTestNetworkCallback.expectBlockedStatusCallbackEventually(mNetwork, true); - assertNetworkAccessBlockedByBpf(true, mUid, true /* metered */); - - } finally { - mMeterednessConfiguration.resetNetworkMeteredness(); - } - - // Set to non-metered network - mMeterednessConfiguration.configureNetworkMeteredness(false); - mTestNetworkCallback.expectCapabilitiesCallbackEventually(mNetwork, - true /* hasCapability */, NET_CAPABILITY_NOT_METERED); - try { - assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); - assertNetworkAccess(false, null); - assertNetworkAccessBlockedByBpf(true, mUid, false /* metered */); - - launchActivity(); - assertTopState(); - assertNetworkAccess(true, null); - mTestNetworkCallback.expectBlockedStatusCallbackEventually(mNetwork, false); - assertNetworkAccessBlockedByBpf(false, mUid, false /* metered */); - - finishActivity(); - assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); - SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); - assertNetworkAccess(false, null); - mTestNetworkCallback.expectBlockedStatusCallbackEventually(mNetwork, true); - assertNetworkAccessBlockedByBpf(true, mUid, false /* metered */); - } finally { - mMeterednessConfiguration.resetNetworkMeteredness(); - } - } - // TODO: 1. test against VPN lockdown. // 2. test against multiple networks. } diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyManagerTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyManagerTest.java index 6d46f73b30..7aeca77178 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyManagerTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyManagerTest.java @@ -17,7 +17,6 @@ package com.android.cts.net.hostside; import static android.app.ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE; -import static android.app.ActivityManager.PROCESS_STATE_TOP_SLEEPING; import static android.os.Process.SYSTEM_UID; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.assertIsUidRestrictedOnMeteredNetworks; @@ -30,11 +29,6 @@ import static com.android.cts.net.hostside.Property.DATA_SAVER_MODE; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import android.os.SystemClock; -import android.platform.test.annotations.RequiresFlagsEnabled; - -import com.android.server.net.Flags; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -244,32 +238,4 @@ public class NetworkPolicyManagerTest extends AbstractRestrictBackgroundNetworkT assertIsUidRestrictedOnMeteredNetworks(mUid, false /* expectedResult */); } } - - @RequiresFlagsEnabled(Flags.FLAG_NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE) - @Test - public void testIsUidNetworkingBlocked_whenInBackground() throws Exception { - try { - assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); - SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); - assertNetworkingBlockedStatusForUid(mUid, METERED, true /* expectedResult */); - assertTrue(isUidNetworkingBlocked(mUid, NON_METERED)); - - launchActivity(); - assertTopState(); - assertNetworkingBlockedStatusForUid(mUid, METERED, false /* expectedResult */); - assertFalse(isUidNetworkingBlocked(mUid, NON_METERED)); - - finishActivity(); - assertProcessStateBelow(PROCESS_STATE_TOP_SLEEPING); - SystemClock.sleep(PROCESS_STATE_TRANSITION_DELAY_MS); - assertNetworkingBlockedStatusForUid(mUid, METERED, true /* expectedResult */); - assertTrue(isUidNetworkingBlocked(mUid, NON_METERED)); - - addPowerSaveModeWhitelist(TEST_APP2_PKG); - assertNetworkingBlockedStatusForUid(mUid, METERED, false /* expectedResult */); - assertFalse(isUidNetworkingBlocked(mUid, NON_METERED)); - } finally { - removePowerSaveModeWhitelist(TEST_APP2_PKG); - } - } } diff --git a/tests/cts/hostside/instrumentation_arguments/Android.bp b/tests/cts/hostside/instrumentation_arguments/Android.bp deleted file mode 100644 index cdede36627..0000000000 --- a/tests/cts/hostside/instrumentation_arguments/Android.bp +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (C) 2024 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - -filegroup { - name: "ArgumentConstants", - srcs: ["src/**/*.java"], -} diff --git a/tests/cts/hostside/instrumentation_arguments/src/com/android/cts/net/arguments/InstrumentationArguments.java b/tests/cts/hostside/instrumentation_arguments/src/com/android/cts/net/arguments/InstrumentationArguments.java deleted file mode 100644 index 472e347c1d..0000000000 --- a/tests/cts/hostside/instrumentation_arguments/src/com/android/cts/net/arguments/InstrumentationArguments.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.cts.net.arguments; - -public interface InstrumentationArguments { - String ARG_WAIVE_BIND_PRIORITY = "waive_bind_priority"; -} diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideConnOnActivityStartTest.java b/tests/cts/hostside/src/com/android/cts/net/HostsideConnOnActivityStartTest.java index 880e826322..849ac7ca72 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideConnOnActivityStartTest.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideConnOnActivityStartTest.java @@ -16,8 +16,6 @@ package com.android.cts.net; -import static com.android.cts.net.arguments.InstrumentationArguments.ARG_WAIVE_BIND_PRIORITY; - import android.platform.test.annotations.FlakyTest; import com.android.testutils.SkipPresubmit; @@ -28,12 +26,9 @@ import com.android.tradefed.testtype.junit4.BeforeClassWithInfo; import org.junit.Test; -import java.util.Map; - @SkipPresubmit(reason = "Out of SLO flakiness") public class HostsideConnOnActivityStartTest extends HostsideNetworkTestCase { private static final String TEST_CLASS = TEST_PKG + ".ConnOnActivityStartTest"; - @BeforeClassWithInfo public static void setUpOnce(TestInformation testInfo) throws Exception { uninstallPackage(testInfo, TEST_APP2_PKG, false); @@ -65,11 +60,4 @@ public class HostsideConnOnActivityStartTest extends HostsideNetworkTestCase { public void testStartActivity_appStandby() throws Exception { runDeviceTests(TEST_PKG, TEST_CLASS, "testStartActivity_appStandby"); } - - // TODO(b/321848487): Annotate with @RequiresFlagsEnabled to mirror the device-side test. - @Test - public void testStartActivity_default() throws Exception { - runDeviceTestsWithArgs(TEST_PKG, TEST_CLASS, "testStartActivity_default", - Map.of(ARG_WAIVE_BIND_PRIORITY, "true")); - } } diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideDefaultNetworkRestrictionsTests.java b/tests/cts/hostside/src/com/android/cts/net/HostsideDefaultNetworkRestrictionsTests.java deleted file mode 100644 index 0d01fc12af..0000000000 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideDefaultNetworkRestrictionsTests.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.cts.net; - -import static com.android.cts.net.arguments.InstrumentationArguments.ARG_WAIVE_BIND_PRIORITY; - -import com.android.testutils.SkipPresubmit; -import com.android.tradefed.device.DeviceNotAvailableException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import java.util.Map; - -// TODO(b/321848487): Annotate with @RequiresFlagsEnabled to mirror the device-side tests. -@SkipPresubmit(reason = "Monitoring for flakiness") -public class HostsideDefaultNetworkRestrictionsTests extends HostsideNetworkTestCase { - private static final String METERED_TEST_CLASS = TEST_PKG + ".DefaultRestrictionsMeteredTest"; - private static final String NON_METERED_TEST_CLASS = - TEST_PKG + ".DefaultRestrictionsNonMeteredTest"; - - @Before - public void setUp() throws Exception { - uninstallPackage(TEST_APP2_PKG, false); - installPackage(TEST_APP2_APK); - } - - @After - public void tearDown() throws Exception { - uninstallPackage(TEST_APP2_PKG, true); - } - - private void runMeteredTest(String methodName) throws DeviceNotAvailableException { - runDeviceTestsWithArgs(TEST_PKG, METERED_TEST_CLASS, methodName, - Map.of(ARG_WAIVE_BIND_PRIORITY, "true")); - } - - private void runNonMeteredTest(String methodName) throws DeviceNotAvailableException { - runDeviceTestsWithArgs(TEST_PKG, NON_METERED_TEST_CLASS, methodName, - Map.of(ARG_WAIVE_BIND_PRIORITY, "true")); - } - - @Test - public void testMeteredNetworkAccess_defaultRestrictions_testActivityNetworkAccess() - throws Exception { - runMeteredTest("testActivityNetworkAccess"); - } - - @Test - public void testMeteredNetworkAccess_defaultRestrictions_testFgsNetworkAccess() - throws Exception { - runMeteredTest("testFgsNetworkAccess"); - } - - @Test - public void testMeteredNetworkAccess_defaultRestrictions_inFullAllowlist() throws Exception { - runMeteredTest("testBackgroundNetworkAccess_inFullAllowlist"); - } - - @Test - public void testMeteredNetworkAccess_defaultRestrictions_inExceptIdleAllowlist() - throws Exception { - runMeteredTest("testBackgroundNetworkAccess_inExceptIdleAllowlist"); - } - - @Test - public void testNonMeteredNetworkAccess_defaultRestrictions_testActivityNetworkAccess() - throws Exception { - runNonMeteredTest("testActivityNetworkAccess"); - } - - @Test - public void testNonMeteredNetworkAccess_defaultRestrictions_testFgsNetworkAccess() - throws Exception { - runNonMeteredTest("testFgsNetworkAccess"); - } - - @Test - public void testNonMeteredNetworkAccess_defaultRestrictions_inFullAllowlist() throws Exception { - runNonMeteredTest("testBackgroundNetworkAccess_inFullAllowlist"); - } - - @Test - public void testNonMeteredNetworkAccess_defaultRestrictions_inExceptIdleAllowlist() - throws Exception { - runNonMeteredTest("testBackgroundNetworkAccess_inExceptIdleAllowlist"); - } -} diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java index 361f7c7d0b..04bd1ad4d2 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java @@ -15,16 +15,12 @@ */ package com.android.cts.net; -import static com.android.cts.net.arguments.InstrumentationArguments.ARG_WAIVE_BIND_PRIORITY; - import com.android.testutils.SkipPresubmit; import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.util.Map; - @SkipPresubmit(reason = "Out of SLO flakiness") public class HostsideNetworkCallbackTests extends HostsideNetworkTestCase { @@ -50,12 +46,5 @@ public class HostsideNetworkCallbackTests extends HostsideNetworkTestCase { runDeviceTests(TEST_PKG, TEST_PKG + ".NetworkCallbackTest", "testOnBlockedStatusChanged_powerSaver"); } - - // TODO(b/321848487): Annotate with @RequiresFlagsEnabled to mirror the device-side test. - @Test - public void testOnBlockedStatusChanged_default() throws Exception { - runDeviceTestsWithArgs(TEST_PKG, TEST_PKG + ".NetworkCallbackTest", - "testOnBlockedStatusChanged_default", Map.of(ARG_WAIVE_BIND_PRIORITY, "true")); - } } diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkPolicyManagerTests.java b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkPolicyManagerTests.java index e97db58a42..3ddb88b70f 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkPolicyManagerTests.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkPolicyManagerTests.java @@ -16,14 +16,10 @@ package com.android.cts.net; -import static com.android.cts.net.arguments.InstrumentationArguments.ARG_WAIVE_BIND_PRIORITY; - import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.util.Map; - public class HostsideNetworkPolicyManagerTests extends HostsideNetworkTestCase { @Before public void setUp() throws Exception { @@ -75,12 +71,4 @@ public class HostsideNetworkPolicyManagerTests extends HostsideNetworkTestCase { runDeviceTests(TEST_PKG, TEST_PKG + ".NetworkPolicyManagerTest", "testIsUidRestrictedOnMeteredNetworks"); } - - // TODO(b/321848487): Annotate with @RequiresFlagsEnabled to mirror the device-side test. - @Test - public void testIsUidNetworkingBlocked_whenInBackground() throws Exception { - runDeviceTestsWithArgs(TEST_PKG, TEST_PKG + ".NetworkPolicyManagerTest", - "testIsUidNetworkingBlocked_whenInBackground", - Map.of(ARG_WAIVE_BIND_PRIORITY, "true")); - } } diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java index ca95ed6e46..3358fd7a6d 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java @@ -31,13 +31,10 @@ import com.android.tradefed.testtype.DeviceJUnit4ClassRunner; import com.android.tradefed.testtype.junit4.AfterClassWithInfo; import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test; import com.android.tradefed.testtype.junit4.BeforeClassWithInfo; -import com.android.tradefed.testtype.junit4.DeviceTestRunOptions; import com.android.tradefed.util.RunUtil; import org.junit.runner.RunWith; -import java.util.Map; - @RunWith(DeviceJUnit4ClassRunner.class) abstract class HostsideNetworkTestCase extends BaseHostJUnit4Test { protected static final boolean DEBUG = false; @@ -149,17 +146,6 @@ abstract class HostsideNetworkTestCase extends BaseHostJUnit4Test { + packageName + ", u=" + currentUser); } - protected boolean runDeviceTestsWithArgs(String packageName, String className, - String methodName, Map args) throws DeviceNotAvailableException { - final DeviceTestRunOptions deviceTestRunOptions = new DeviceTestRunOptions(packageName) - .setTestClassName(className) - .setTestMethodName(methodName); - for (Map.Entry arg : args.entrySet()) { - deviceTestRunOptions.addInstrumentationArg(arg.getKey(), arg.getValue()); - } - return runDeviceTests(deviceTestRunOptions); - } - protected String runCommand(String command) throws DeviceNotAvailableException { Log.d(TAG, "Command: '" + command + "'"); final String output = getDevice().executeShellCommand(command); From 6d45ec3539110162a9a1c5e77b6da4b94e2a0aaf Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Thu, 25 Jan 2024 12:12:43 +0900 Subject: [PATCH 11/19] Include FlaggedApi.bp in main Test: TH Bug: 321624552 Ignore-AOSP-First: Merged in aosp/2927450 Change-Id: Iecb6f4d0a6e5e036299783b49108df3a88c5493e --- common/Android.bp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/Android.bp b/common/Android.bp index b9a3b634cb..69d12527f8 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -19,6 +19,8 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } +build = ["FlaggedApi.bp"] + // This is a placeholder comment to avoid merge conflicts // as the above target may not exist // depending on the branch From 212c54b3444bd85cccef73c25b225342de90e0cf Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Tue, 16 Jan 2024 13:32:31 +0800 Subject: [PATCH 12/19] Enforce package name belongs to the caller's uid Ignore-AOSP-First: Security Fix Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.net.NetworkStatsServiceTest Fix: 274443951 Fix: 243376076 Change-Id: I4ef7eff6567b848c8cfa52c51c734642ce929589 --- .../server/net/NetworkStatsService.java | 7 ++- .../server/net/NetworkStatsServiceTest.java | 52 ++++++++++++++++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/service-t/src/com/android/server/net/NetworkStatsService.java b/service-t/src/com/android/server/net/NetworkStatsService.java index 78c4504977..8250113128 100644 --- a/service-t/src/com/android/server/net/NetworkStatsService.java +++ b/service-t/src/com/android/server/net/NetworkStatsService.java @@ -1436,7 +1436,11 @@ public class NetworkStatsService extends INetworkStatsService.Stub { } @Override - public INetworkStatsSession openSessionForUsageStats(int flags, String callingPackage) { + public INetworkStatsSession openSessionForUsageStats( + int flags, @NonNull String callingPackage) { + Objects.requireNonNull(callingPackage); + PermissionUtils.enforcePackageNameMatchesUid( + mContext, Binder.getCallingUid(), callingPackage); return openSessionInternal(flags, callingPackage); } @@ -1951,6 +1955,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub { final int callingPid = Binder.getCallingPid(); final int callingUid = Binder.getCallingUid(); + PermissionUtils.enforcePackageNameMatchesUid(mContext, callingUid, callingPackage); @NetworkStatsAccess.Level int accessLevel = checkAccessLevel(callingPackage); DataUsageRequest normalizedRequest; final long token = Binder.clearCallingIdentity(); diff --git a/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java b/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java index a5fee5b80c..b45a49dc5e 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java @@ -64,6 +64,7 @@ import static android.text.format.DateUtils.HOUR_IN_MILLIS; import static android.text.format.DateUtils.MINUTE_IN_MILLIS; import static android.text.format.DateUtils.WEEK_IN_MILLIS; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.doThrow; import static com.android.server.net.NetworkStatsEventLogger.POLL_REASON_RAT_CHANGED; import static com.android.server.net.NetworkStatsEventLogger.PollEvent.pollReasonNameOf; import static com.android.server.net.NetworkStatsService.ACTION_NETWORK_STATS_POLL; @@ -98,6 +99,7 @@ import android.annotation.NonNull; import android.app.AlarmManager; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.content.res.Resources; import android.database.ContentObserver; import android.net.DataUsageRequest; @@ -125,7 +127,9 @@ import android.os.HandlerThread; import android.os.IBinder; import android.os.Looper; import android.os.PowerManager; +import android.os.Process; import android.os.SimpleClock; +import android.os.UserHandle; import android.provider.Settings; import android.system.ErrnoException; import android.telephony.TelephonyManager; @@ -245,6 +249,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest { private static @Mock WifiInfo sWifiInfo; private @Mock INetd mNetd; private @Mock TetheringManager mTetheringManager; + private @Mock PackageManager mPm; private @Mock NetworkStatsFactory mStatsFactory; @NonNull private final TestNetworkStatsSettings mSettings = @@ -304,6 +309,16 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest { mBaseContext = base; } + @Override + public PackageManager getPackageManager() { + return mPm; + } + + @Override + public Context createContextAsUser(UserHandle user, int flags) { + return this; + } + @Override public Object getSystemService(String name) { if (Context.TELEPHONY_SERVICE.equals(name)) return mTelephonyManager; @@ -427,6 +442,9 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest { any(), tetheringEventCbCaptor.capture()); mTetheringEventCallback = tetheringEventCbCaptor.getValue(); + doReturn(Process.myUid()).when(mPm) + .getPackageUid(eq(mServiceContext.getPackageName()), anyInt()); + mUsageCallback = new TestableUsageCallback(mUsageCallbackBinder); } @@ -1593,7 +1611,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest { // Register and verify request and that binder was called DataUsageRequest request = mService.registerUsageCallback( - mServiceContext.getOpPackageName(), inputRequest, mUsageCallback); + mServiceContext.getPackageName(), inputRequest, mUsageCallback); assertTrue(request.requestId > 0); assertTrue(Objects.equals(sTemplateWifi, request.template)); long minThresholdInBytes = 2 * 1024 * 1024; // 2 MB @@ -2805,6 +2823,38 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest { assertDumpContains(dump, pollReasonNameOf(POLL_REASON_RAT_CHANGED)); } + @Test + public void testEnforcePackageNameMatchesUid() throws Exception { + final String testMyPackageName = "test.package.myname"; + final String testRedPackageName = "test.package.red"; + final String testInvalidPackageName = "test.package.notfound"; + + doReturn(UID_RED).when(mPm).getPackageUid(eq(testRedPackageName), anyInt()); + doReturn(Process.myUid()).when(mPm).getPackageUid(eq(testMyPackageName), anyInt()); + doThrow(new PackageManager.NameNotFoundException()).when(mPm) + .getPackageUid(eq(testInvalidPackageName), anyInt()); + + assertThrows(SecurityException.class, () -> + mService.openSessionForUsageStats(0 /* flags */, testRedPackageName)); + assertThrows(SecurityException.class, () -> + mService.openSessionForUsageStats(0 /* flags */, testInvalidPackageName)); + assertThrows(NullPointerException.class, () -> + mService.openSessionForUsageStats(0 /* flags */, null)); + // Verify package name belongs to ourselves does not throw. + mService.openSessionForUsageStats(0 /* flags */, testMyPackageName); + + long thresholdInBytes = 10 * 1024 * 1024; // 10 MB + DataUsageRequest request = new DataUsageRequest( + 2 /* requestId */, sTemplateImsi1, thresholdInBytes); + assertThrows(SecurityException.class, () -> + mService.registerUsageCallback(testRedPackageName, request, mUsageCallback)); + assertThrows(SecurityException.class, () -> + mService.registerUsageCallback(testInvalidPackageName, request, mUsageCallback)); + assertThrows(NullPointerException.class, () -> + mService.registerUsageCallback(null, request, mUsageCallback)); + mService.registerUsageCallback(testMyPackageName, request, mUsageCallback); + } + @Test public void testDumpSkDestroyListenerLogs() throws ErrnoException { doAnswer((invocation) -> { From 985604c94f74657ffe18e43556bfdf4fc0629e14 Mon Sep 17 00:00:00 2001 From: Aditya Choudhary Date: Wed, 31 Jan 2024 11:08:57 +0000 Subject: [PATCH 13/19] [DON'T BLOCK] Test ownership migration rules This CL is created as a best effort to migrate test targets to the new android ownership model. If you find incorrect or unnecessary attribution in this CL, please create a separate CL to fix that. For more details please refer to the link below, Bug: 304529413 Test: N/A (cherry picked from https://android-review.googlesource.com/q/commit:a8ac702eb268d687d089ba218926ae6b17cda33c) Change-Id: I243f17b3f0ad7af9ffa15ca242456e36688733f5 Merged-In: I243f17b3f0ad7af9ffa15ca242456e36688733f5 --- Cronet/tests/common/Android.bp | 1 + Cronet/tests/cts/Android.bp | 5 +- Cronet/tests/mts/Android.bp | 1 + DnsResolver/Android.bp | 10 +- Tethering/Android.bp | 1 + Tethering/apex/Android.bp | 3 +- Tethering/apex/permissions/Android.bp | 3 +- Tethering/common/TetheringLib/Android.bp | 17 ++-- Tethering/tests/Android.bp | 3 +- Tethering/tests/integration/Android.bp | 7 +- Tethering/tests/mts/Android.bp | 1 + Tethering/tests/privileged/Android.bp | 1 + Tethering/tests/unit/Android.bp | 5 +- bpf_progs/Android.bp | 1 + clatd/Android.bp | 5 +- common/Android.bp | 1 + framework-t/Android.bp | 2 + framework/Android.bp | 1 + nearby/apex/Android.bp | 1 + nearby/framework/Android.bp | 1 + nearby/service/Android.bp | 1 + nearby/service/proto/Android.bp | 3 +- nearby/tests/cts/fastpair/Android.bp | 1 + .../tests/integration/privileged/Android.bp | 1 + nearby/tests/integration/untrusted/Android.bp | 1 + nearby/tests/unit/Android.bp | 1 + netbpfload/Android.bp | 4 + netd/Android.bp | 10 +- remoteauth/framework/Android.bp | 1 + remoteauth/service/Android.bp | 1 + remoteauth/service/jni/Android.bp | 1 + remoteauth/tests/unit/Android.bp | 1 + service-t/Android.bp | 1 + .../native/libs/libnetworkstats/Android.bp | 8 +- service/Android.bp | 1 + .../ServiceConnectivityResources/Android.bp | 1 + service/libconnectivity/Android.bp | 1 + service/native/libs/libclat/Android.bp | 6 +- staticlibs/Android.bp | 99 ++++++++++--------- staticlibs/client-libs/Android.bp | 9 +- staticlibs/client-libs/tests/unit/Android.bp | 3 +- staticlibs/native/bpf_headers/Android.bp | 1 + .../native/bpf_syscall_wrappers/Android.bp | 1 + staticlibs/native/bpfmapjni/Android.bp | 1 + staticlibs/native/bpfutiljni/Android.bp | 1 + staticlibs/native/ip_checksum/Android.bp | 1 + staticlibs/native/netjniutils/Android.bp | 1 + staticlibs/native/nettestutils/Android.bp | 1 + staticlibs/native/tcutils/Android.bp | 1 + staticlibs/netd/Android.bp | 1 + staticlibs/netd/libnetdutils/Android.bp | 6 +- staticlibs/tests/unit/Android.bp | 12 ++- staticlibs/testutils/Android.bp | 15 ++- .../app/connectivitychecker/Android.bp | 5 +- tests/benchmark/Android.bp | 2 +- tests/common/Android.bp | 8 +- tests/cts/hostside/Android.bp | 3 +- tests/cts/hostside/aidl/Android.bp | 1 + tests/cts/hostside/app/Android.bp | 1 + tests/cts/hostside/app2/Android.bp | 1 + tests/cts/hostside/certs/Android.bp | 1 + .../hostside/networkslicingtestapp/Android.bp | 13 +-- tests/cts/net/Android.bp | 3 +- tests/cts/net/api23Test/Android.bp | 1 + tests/cts/net/appForApi23/Android.bp | 1 + tests/cts/net/jni/Android.bp | 1 + tests/cts/net/native/Android.bp | 1 + tests/cts/net/native/dns/Android.bp | 1 + tests/cts/net/util/Android.bp | 6 +- .../internetpermission/Android.bp | 1 + .../updatestatspermission/Android.bp | 1 + tests/cts/tethering/Android.bp | 1 + tests/deflake/Android.bp | 1 + tests/integration/Android.bp | 6 +- tests/mts/Android.bp | 3 +- .../connectivity_native_test/Android.bp | 1 + tests/native/utilities/Android.bp | 3 +- tests/smoketest/Android.bp | 1 + tests/unit/Android.bp | 5 +- tests/unit/jni/Android.bp | 1 + thread/apex/Android.bp | 1 + thread/demoapp/Android.bp | 1 + thread/framework/Android.bp | 1 + thread/service/Android.bp | 1 + thread/tests/cts/Android.bp | 1 + thread/tests/integration/Android.bp | 1 + thread/tests/unit/Android.bp | 1 + tools/Android.bp | 1 + 88 files changed, 239 insertions(+), 109 deletions(-) diff --git a/Cronet/tests/common/Android.bp b/Cronet/tests/common/Android.bp index a484adb0e2..edeb0b3ebc 100644 --- a/Cronet/tests/common/Android.bp +++ b/Cronet/tests/common/Android.bp @@ -17,6 +17,7 @@ // They must be fast and stable, and exercise public or test APIs. package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/Cronet/tests/cts/Android.bp b/Cronet/tests/cts/Android.bp index 7b52694b1a..92b73d954c 100644 --- a/Cronet/tests/cts/Android.bp +++ b/Cronet/tests/cts/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -46,7 +47,9 @@ android_library { "framework-connectivity", "org.apache.http.legacy", ], - lint: { test: true } + lint: { + test: true, + }, } android_test { diff --git a/Cronet/tests/mts/Android.bp b/Cronet/tests/mts/Android.bp index 743a1cabe6..9486e1f0a4 100644 --- a/Cronet/tests/mts/Android.bp +++ b/Cronet/tests/mts/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/DnsResolver/Android.bp b/DnsResolver/Android.bp index d1330343f3..716eb101c5 100644 --- a/DnsResolver/Android.bp +++ b/DnsResolver/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -56,7 +57,10 @@ cc_library { cc_test { name: "dns_helper_unit_test", defaults: ["netd_defaults"], - test_suites: ["general-tests", "mts-tethering"], + test_suites: [ + "general-tests", + "mts-tethering", + ], test_config_template: ":net_native_test_config_template", header_libs: [ "bpf_connectivity_headers", @@ -68,8 +72,8 @@ cc_test { "libcom.android.tethering.dns_helper", ], shared_libs: [ - "libbase", - "libcutils", + "libbase", + "libcutils", ], compile_multilib: "both", multilib: { diff --git a/Tethering/Android.bp b/Tethering/Android.bp index c30e25103d..fba7d69417 100644 --- a/Tethering/Android.bp +++ b/Tethering/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp index 1006238942..30df26f1ce 100644 --- a/Tethering/apex/Android.bp +++ b/Tethering/apex/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -92,7 +93,7 @@ apex { both: { jni_libs: [ "libframework-connectivity-jni", - "libframework-connectivity-tiramisu-jni" + "libframework-connectivity-tiramisu-jni", ], }, }, diff --git a/Tethering/apex/permissions/Android.bp b/Tethering/apex/permissions/Android.bp index 69c1aa2d4c..20772a8e09 100644 --- a/Tethering/apex/permissions/Android.bp +++ b/Tethering/apex/permissions/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], default_visibility: ["//packages/modules/Connectivity/Tethering:__subpackages__"], } @@ -22,4 +23,4 @@ package { filegroup { name: "privapp_allowlist_com.android.tethering", srcs: ["permissions.xml"], -} \ No newline at end of file +} diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp index bcea425c93..9c2a59dcd7 100644 --- a/Tethering/common/TetheringLib/Android.bp +++ b/Tethering/common/TetheringLib/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -55,14 +56,16 @@ java_sdk_library { hostdex: true, // for hiddenapi check permitted_packages: ["android.net"], - lint: { strict_updatability_linting: true }, + lint: { + strict_updatability_linting: true, + }, } java_library { - name: "framework-tethering-pre-jarjar", - defaults: [ - "framework-tethering-defaults", - ], + name: "framework-tethering-pre-jarjar", + defaults: [ + "framework-tethering-defaults", + ], } java_genrule { @@ -88,7 +91,7 @@ java_defaults { name: "framework-tethering-defaults", defaults: ["framework-module-defaults"], srcs: [ - ":framework-tethering-srcs" + ":framework-tethering-srcs", ], libs: ["framework-connectivity.stubs.module_lib"], aidl: { @@ -107,5 +110,5 @@ filegroup { "src/**/*.aidl", "src/**/*.java", ], - path: "src" + path: "src", } diff --git a/Tethering/tests/Android.bp b/Tethering/tests/Android.bp index 72ca666638..22cf3c5953 100644 --- a/Tethering/tests/Android.bp +++ b/Tethering/tests/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -24,5 +25,5 @@ filegroup { visibility: [ "//packages/modules/Connectivity/tests:__subpackages__", "//packages/modules/Connectivity/Tethering/tests:__subpackages__", - ] + ], } diff --git a/Tethering/tests/integration/Android.bp b/Tethering/tests/integration/Android.bp index 2594a5e13c..f17396d439 100644 --- a/Tethering/tests/integration/Android.bp +++ b/Tethering/tests/integration/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -50,7 +51,7 @@ android_library { visibility: [ "//packages/modules/Connectivity/Tethering/tests/mts", "//packages/modules/Connectivity/tests/cts/net", - ] + ], } // Library including tethering integration tests targeting the latest stable SDK. @@ -67,7 +68,7 @@ android_library { "//packages/modules/Connectivity/tests/cts/tethering", "//packages/modules/Connectivity/tests:__subpackages__", "//packages/modules/Connectivity/Tethering/tests:__subpackages__", - ] + ], } // Library including tethering integration tests targeting current development SDK. @@ -83,7 +84,7 @@ android_library { visibility: [ "//packages/modules/Connectivity/tests/cts/tethering", "//packages/modules/Connectivity/Tethering/tests/mts", - ] + ], } // TODO: remove because TetheringIntegrationTests has been covered by ConnectivityCoverageTests. diff --git a/Tethering/tests/mts/Android.bp b/Tethering/tests/mts/Android.bp index 4f4b03cb1e..a80e49e43d 100644 --- a/Tethering/tests/mts/Android.bp +++ b/Tethering/tests/mts/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/Tethering/tests/privileged/Android.bp b/Tethering/tests/privileged/Android.bp index c890197227..ba6be664c6 100644 --- a/Tethering/tests/privileged/Android.bp +++ b/Tethering/tests/privileged/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/Tethering/tests/unit/Android.bp b/Tethering/tests/unit/Android.bp index 36d9a6362d..24407ca57c 100644 --- a/Tethering/tests/unit/Android.bp +++ b/Tethering/tests/unit/Android.bp @@ -16,6 +16,7 @@ // Tests in this folder are included both in unit tests and CTS. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -23,7 +24,7 @@ java_library { name: "TetheringCommonTests", srcs: [ "common/**/*.java", - "common/**/*.kt" + "common/**/*.kt", ], static_libs: [ "androidx.test.rules", @@ -95,7 +96,7 @@ android_library { visibility: [ "//packages/modules/Connectivity/tests:__subpackages__", "//packages/modules/Connectivity/Tethering/tests:__subpackages__", - ] + ], } android_test { diff --git a/bpf_progs/Android.bp b/bpf_progs/Android.bp index cdf47e7da5..674cd98535 100644 --- a/bpf_progs/Android.bp +++ b/bpf_progs/Android.bp @@ -18,6 +18,7 @@ // struct definitions shared with JNI // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/clatd/Android.bp b/clatd/Android.bp index 595c6b924d..43eb2d8e59 100644 --- a/clatd/Android.bp +++ b/clatd/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["external_android-clat_license"], } @@ -54,7 +55,7 @@ cc_binary { defaults: ["clatd_defaults"], srcs: [ ":clatd_common", - "main.c" + "main.c", ], static_libs: [ "libip_checksum", @@ -101,7 +102,7 @@ cc_test { defaults: ["clatd_defaults"], srcs: [ ":clatd_common", - "clatd_test.cpp" + "clatd_test.cpp", ], static_libs: [ "libbase", diff --git a/common/Android.bp b/common/Android.bp index b9a3b634cb..f4b4caef2a 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/framework-t/Android.bp b/framework-t/Android.bp index fa7b794734..76d2b52111 100644 --- a/framework-t/Android.bp +++ b/framework-t/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } @@ -34,6 +35,7 @@ java_defaults { name: "enable-framework-connectivity-t-targets", enabled: true, } + // The above defaults can be used to disable framework-connectivity t // targets while minimizing merge conflicts in the build rules. diff --git a/framework/Android.bp b/framework/Android.bp index b7ff04fec1..31ddb5315f 100644 --- a/framework/Android.bp +++ b/framework/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/apex/Android.bp b/nearby/apex/Android.bp index d7f063a662..5fdf5c95ac 100644 --- a/nearby/apex/Android.bp +++ b/nearby/apex/Android.bp @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/framework/Android.bp b/nearby/framework/Android.bp index 4bb9efdb81..0fd9a89372 100644 --- a/nearby/framework/Android.bp +++ b/nearby/framework/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/service/Android.bp b/nearby/service/Android.bp index 17b80b0d84..d34fd837ef 100644 --- a/nearby/service/Android.bp +++ b/nearby/service/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/service/proto/Android.bp b/nearby/service/proto/Android.bp index 1b00cf6784..be5a0b3c60 100644 --- a/nearby/service/proto/Android.bp +++ b/nearby/service/proto/Android.bp @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -41,4 +42,4 @@ java_library { apex_available: [ "com.android.tethering", ], -} \ No newline at end of file +} diff --git a/nearby/tests/cts/fastpair/Android.bp b/nearby/tests/cts/fastpair/Android.bp index 4309d7ed25..aa2806d1b7 100644 --- a/nearby/tests/cts/fastpair/Android.bp +++ b/nearby/tests/cts/fastpair/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/tests/integration/privileged/Android.bp b/nearby/tests/integration/privileged/Android.bp index 9b6e488029..5e6400974a 100644 --- a/nearby/tests/integration/privileged/Android.bp +++ b/nearby/tests/integration/privileged/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/tests/integration/untrusted/Android.bp b/nearby/tests/integration/untrusted/Android.bp index 75f765b67f..e6259c5a26 100644 --- a/nearby/tests/integration/untrusted/Android.bp +++ b/nearby/tests/integration/untrusted/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/tests/unit/Android.bp b/nearby/tests/unit/Android.bp index bbf42c7c9c..295056832c 100644 --- a/nearby/tests/unit/Android.bp +++ b/nearby/tests/unit/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/netbpfload/Android.bp b/netbpfload/Android.bp index 1f92374b83..037750ee43 100644 --- a/netbpfload/Android.bp +++ b/netbpfload/Android.bp @@ -14,6 +14,10 @@ // limitations under the License. // +package { + default_team: "trendy_team_fwk_core_networking", +} + cc_binary { name: "netbpfload", diff --git a/netd/Android.bp b/netd/Android.bp index 3cdbc9780c..eedbdae504 100644 --- a/netd/Android.bp +++ b/netd/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -58,15 +59,18 @@ cc_library { cc_test { name: "netd_updatable_unit_test", defaults: ["netd_defaults"], - test_suites: ["general-tests", "mts-tethering"], + test_suites: [ + "general-tests", + "mts-tethering", + ], test_config_template: ":net_native_test_config_template", - require_root: true, // required by setrlimitForTest() + require_root: true, // required by setrlimitForTest() header_libs: [ "bpf_connectivity_headers", ], srcs: [ "BpfHandlerTest.cpp", - "BpfBaseTest.cpp" + "BpfBaseTest.cpp", ], static_libs: [ "libbase", diff --git a/remoteauth/framework/Android.bp b/remoteauth/framework/Android.bp index 71b621a3ec..2f1737f346 100644 --- a/remoteauth/framework/Android.bp +++ b/remoteauth/framework/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/remoteauth/service/Android.bp b/remoteauth/service/Android.bp index 8330efc1da..32ae54f5b6 100644 --- a/remoteauth/service/Android.bp +++ b/remoteauth/service/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/remoteauth/service/jni/Android.bp b/remoteauth/service/jni/Android.bp index a95a8fb90d..c0ac7799fc 100644 --- a/remoteauth/service/jni/Android.bp +++ b/remoteauth/service/jni/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/remoteauth/tests/unit/Android.bp b/remoteauth/tests/unit/Android.bp index 77e6f19368..47b9e31c89 100644 --- a/remoteauth/tests/unit/Android.bp +++ b/remoteauth/tests/unit/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/service-t/Android.bp b/service-t/Android.bp index 87687875a7..ef76eae8e5 100644 --- a/service-t/Android.bp +++ b/service-t/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/service-t/native/libs/libnetworkstats/Android.bp b/service-t/native/libs/libnetworkstats/Android.bp index b9f3adb91c..c62063404a 100644 --- a/service-t/native/libs/libnetworkstats/Android.bp +++ b/service-t/native/libs/libnetworkstats/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -57,9 +58,12 @@ cc_library { cc_test { name: "libnetworkstats_test", - test_suites: ["general-tests", "mts-tethering"], + test_suites: [ + "general-tests", + "mts-tethering", + ], test_config_template: ":net_native_test_config_template", - require_root: true, // required by setrlimitForTest() + require_root: true, // required by setrlimitForTest() header_libs: ["bpf_connectivity_headers"], srcs: [ "BpfNetworkStatsTest.cpp", diff --git a/service/Android.bp b/service/Android.bp index 525bd02481..edabb38302 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/service/ServiceConnectivityResources/Android.bp b/service/ServiceConnectivityResources/Android.bp index 2260596565..2621256f01 100644 --- a/service/ServiceConnectivityResources/Android.bp +++ b/service/ServiceConnectivityResources/Android.bp @@ -16,6 +16,7 @@ // APK to hold all the wifi overlayable resources. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/service/libconnectivity/Android.bp b/service/libconnectivity/Android.bp index e063af7ce6..3a72134e07 100644 --- a/service/libconnectivity/Android.bp +++ b/service/libconnectivity/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/service/native/libs/libclat/Android.bp b/service/native/libs/libclat/Android.bp index 5c6b12395d..6c1c2c4b2d 100644 --- a/service/native/libs/libclat/Android.bp +++ b/service/native/libs/libclat/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -38,7 +39,10 @@ cc_library_static { cc_test { name: "libclat_test", defaults: ["netd_defaults"], - test_suites: ["general-tests", "mts-tethering"], + test_suites: [ + "general-tests", + "mts-tethering", + ], test_config_template: ":net_native_test_config_template", srcs: [ "clatutils_test.cpp", diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp index 8f018c004f..3cbabcce0d 100644 --- a/staticlibs/Android.bp +++ b/staticlibs/Android.bp @@ -28,34 +28,35 @@ // though they are not in the current.txt files. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } java_library { - name: "net-utils-device-common", - srcs: [ - "device/com/android/net/module/util/arp/ArpPacket.java", - "device/com/android/net/module/util/DeviceConfigUtils.java", - "device/com/android/net/module/util/DomainUtils.java", - "device/com/android/net/module/util/FdEventsReader.java", - "device/com/android/net/module/util/NetworkMonitorUtils.java", - "device/com/android/net/module/util/PacketReader.java", - "device/com/android/net/module/util/SharedLog.java", - "device/com/android/net/module/util/SocketUtils.java", - "device/com/android/net/module/util/FeatureVersions.java", - "device/com/android/net/module/util/HandlerUtils.java", - // This library is used by system modules, for which the system health impact of Kotlin - // has not yet been evaluated. Annotations may need jarjar'ing. - // "src_devicecommon/**/*.kt", - ], - sdk_version: "module_current", - min_sdk_version: "30", - target_sdk_version: "30", - apex_available: [ - "//apex_available:anyapex", - "//apex_available:platform", - ], - visibility: [ + name: "net-utils-device-common", + srcs: [ + "device/com/android/net/module/util/arp/ArpPacket.java", + "device/com/android/net/module/util/DeviceConfigUtils.java", + "device/com/android/net/module/util/DomainUtils.java", + "device/com/android/net/module/util/FdEventsReader.java", + "device/com/android/net/module/util/NetworkMonitorUtils.java", + "device/com/android/net/module/util/PacketReader.java", + "device/com/android/net/module/util/SharedLog.java", + "device/com/android/net/module/util/SocketUtils.java", + "device/com/android/net/module/util/FeatureVersions.java", + "device/com/android/net/module/util/HandlerUtils.java", + // This library is used by system modules, for which the system health impact of Kotlin + // has not yet been evaluated. Annotations may need jarjar'ing. + // "src_devicecommon/**/*.kt", + ], + sdk_version: "module_current", + min_sdk_version: "30", + target_sdk_version: "30", + apex_available: [ + "//apex_available:anyapex", + "//apex_available:platform", + ], + visibility: [ "//frameworks/base/packages/Tethering", "//packages/modules/Connectivity:__subpackages__", "//packages/modules/Connectivity/framework:__subpackages__", @@ -65,26 +66,26 @@ java_library { "//frameworks/opt/net/telephony", "//packages/modules/NetworkStack:__subpackages__", "//packages/modules/CaptivePortalLogin", - ], - static_libs: [ - "net-utils-framework-common", - ], - libs: [ - "androidx.annotation_annotation", - "framework-annotations-lib", - "framework-configinfrastructure", - "framework-connectivity.stubs.module_lib", - ], - lint: { - strict_updatability_linting: true, - error_checks: ["NewApi"], - }, + ], + static_libs: [ + "net-utils-framework-common", + ], + libs: [ + "androidx.annotation_annotation", + "framework-annotations-lib", + "framework-configinfrastructure", + "framework-connectivity.stubs.module_lib", + ], + lint: { + strict_updatability_linting: true, + error_checks: ["NewApi"], + }, } java_defaults { name: "lib_mockito_extended", static_libs: [ - "mockito-target-extended-minus-junit4" + "mockito-target-extended-minus-junit4", ], jni_libs: [ "libdexmakerjvmtiagent", @@ -95,12 +96,12 @@ java_defaults { java_library { name: "net-utils-dnspacket-common", srcs: [ - "framework/**/DnsPacket.java", - "framework/**/DnsPacketUtils.java", - "framework/**/DnsSvcbPacket.java", - "framework/**/DnsSvcbRecord.java", - "framework/**/HexDump.java", - "framework/**/NetworkStackConstants.java", + "framework/**/DnsPacket.java", + "framework/**/DnsPacketUtils.java", + "framework/**/DnsSvcbPacket.java", + "framework/**/DnsSvcbRecord.java", + "framework/**/HexDump.java", + "framework/**/NetworkStackConstants.java", ], sdk_version: "module_current", visibility: [ @@ -464,10 +465,10 @@ filegroup { filegroup { name: "net-utils-wifi-service-common-srcs", srcs: [ - "device/android/net/NetworkFactory.java", - "device/android/net/NetworkFactoryImpl.java", - "device/android/net/NetworkFactoryLegacyImpl.java", - "device/android/net/NetworkFactoryShim.java", + "device/android/net/NetworkFactory.java", + "device/android/net/NetworkFactoryImpl.java", + "device/android/net/NetworkFactoryLegacyImpl.java", + "device/android/net/NetworkFactoryShim.java", ], visibility: [ "//frameworks/opt/net/wifi/service", diff --git a/staticlibs/client-libs/Android.bp b/staticlibs/client-libs/Android.bp index c938dd613d..f665584f83 100644 --- a/staticlibs/client-libs/Android.bp +++ b/staticlibs/client-libs/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -10,17 +11,17 @@ java_library { apex_available: [ "//apex_available:platform", "com.android.tethering", - "com.android.wifi" + "com.android.wifi", ], visibility: [ "//packages/modules/Connectivity:__subpackages__", "//frameworks/base/services:__subpackages__", "//frameworks/base/packages:__subpackages__", - "//packages/modules/Wifi/service:__subpackages__" + "//packages/modules/Wifi/service:__subpackages__", ], libs: ["androidx.annotation_annotation"], static_libs: [ "netd_aidl_interface-lateststable-java", - "netd_event_listener_interface-lateststable-java" - ] + "netd_event_listener_interface-lateststable-java", + ], } diff --git a/staticlibs/client-libs/tests/unit/Android.bp b/staticlibs/client-libs/tests/unit/Android.bp index 03e3e70054..7aafd69c58 100644 --- a/staticlibs/client-libs/tests/unit/Android.bp +++ b/staticlibs/client-libs/tests/unit/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -26,7 +27,7 @@ android_library { "//packages/modules/Connectivity/tests:__subpackages__", "//packages/modules/Connectivity/Tethering/tests:__subpackages__", "//packages/modules/NetworkStack/tests/integration", - ] + ], } android_test { diff --git a/staticlibs/native/bpf_headers/Android.bp b/staticlibs/native/bpf_headers/Android.bp index 41184ea48e..d55584ac59 100644 --- a/staticlibs/native/bpf_headers/Android.bp +++ b/staticlibs/native/bpf_headers/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/bpf_syscall_wrappers/Android.bp b/staticlibs/native/bpf_syscall_wrappers/Android.bp index b3efc21668..1e0cb224a5 100644 --- a/staticlibs/native/bpf_syscall_wrappers/Android.bp +++ b/staticlibs/native/bpf_syscall_wrappers/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/bpfmapjni/Android.bp b/staticlibs/native/bpfmapjni/Android.bp index 8babcce3f7..7e6b4ec452 100644 --- a/staticlibs/native/bpfmapjni/Android.bp +++ b/staticlibs/native/bpfmapjni/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/bpfutiljni/Android.bp b/staticlibs/native/bpfutiljni/Android.bp index 39a2795086..1ef01a67de 100644 --- a/staticlibs/native/bpfutiljni/Android.bp +++ b/staticlibs/native/bpfutiljni/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/ip_checksum/Android.bp b/staticlibs/native/ip_checksum/Android.bp index 9878d73771..e2e118e822 100644 --- a/staticlibs/native/ip_checksum/Android.bp +++ b/staticlibs/native/ip_checksum/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/netjniutils/Android.bp b/staticlibs/native/netjniutils/Android.bp index ca3bbbc0a1..4cab45907b 100644 --- a/staticlibs/native/netjniutils/Android.bp +++ b/staticlibs/native/netjniutils/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/nettestutils/Android.bp b/staticlibs/native/nettestutils/Android.bp index df3bb4288c..ef87f04ca7 100644 --- a/staticlibs/native/nettestutils/Android.bp +++ b/staticlibs/native/nettestutils/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/tcutils/Android.bp b/staticlibs/native/tcutils/Android.bp index 9a38745c69..926590d24a 100644 --- a/staticlibs/native/tcutils/Android.bp +++ b/staticlibs/native/tcutils/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/netd/Android.bp b/staticlibs/netd/Android.bp index 2b7e620705..59ef20d34a 100644 --- a/staticlibs/netd/Android.bp +++ b/staticlibs/netd/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/netd/libnetdutils/Android.bp b/staticlibs/netd/libnetdutils/Android.bp index fdb9380d4f..2ae5911ecf 100644 --- a/staticlibs/netd/libnetdutils/Android.bp +++ b/staticlibs/netd/libnetdutils/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -22,7 +23,10 @@ cc_library { "Utils.cpp", ], defaults: ["netd_defaults"], - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], shared_libs: [ "libbase", "liblog", diff --git a/staticlibs/tests/unit/Android.bp b/staticlibs/tests/unit/Android.bp index 0dfca57f44..d203bc0a0b 100644 --- a/staticlibs/tests/unit/Android.bp +++ b/staticlibs/tests/unit/Android.bp @@ -3,12 +3,16 @@ //######################################################################## package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } android_library { name: "NetworkStaticLibTestsLib", - srcs: ["src/**/*.java","src/**/*.kt"], + srcs: [ + "src/**/*.java", + "src/**/*.kt", + ], min_sdk_version: "30", defaults: ["framework-connectivity-test-defaults"], static_libs: [ @@ -35,7 +39,7 @@ android_library { ], lint: { strict_updatability_linting: true, - test: true + test: true, }, } @@ -52,5 +56,7 @@ android_test { ], jarjar_rules: "jarjar-rules.txt", test_suites: ["device-tests"], - lint: { strict_updatability_linting: true }, + lint: { + strict_updatability_linting: true, + }, } diff --git a/staticlibs/testutils/Android.bp b/staticlibs/testutils/Android.bp index 43853ee463..a8e5a69e02 100644 --- a/staticlibs/testutils/Android.bp +++ b/staticlibs/testutils/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -24,11 +25,11 @@ java_library { ], defaults: [ "framework-connectivity-test-defaults", - "lib_mockito_extended" + "lib_mockito_extended", ], libs: [ "androidx.annotation_annotation", - "net-utils-device-common-bpf", // TestBpfMap extends IBpfMap. + "net-utils-device-common-bpf", // TestBpfMap extends IBpfMap. ], static_libs: [ "androidx.test.ext.junit", @@ -42,7 +43,9 @@ java_library { "net-utils-device-common-wear", "modules-utils-build_system", ], - lint: { strict_updatability_linting: true }, + lint: { + strict_updatability_linting: true, + }, } java_library { @@ -72,9 +75,11 @@ java_library { "jsr305", ], static_libs: [ - "kotlin-test" + "kotlin-test", ], - lint: { strict_updatability_linting: true }, + lint: { + strict_updatability_linting: true, + }, } java_test_host { diff --git a/staticlibs/testutils/app/connectivitychecker/Android.bp b/staticlibs/testutils/app/connectivitychecker/Android.bp index 049ec9e1b7..5af8c147f9 100644 --- a/staticlibs/testutils/app/connectivitychecker/Android.bp +++ b/staticlibs/testutils/app/connectivitychecker/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -30,5 +31,7 @@ android_test_helper_app { "net-tests-utils", ], host_required: ["net-tests-utils-host-common"], - lint: { strict_updatability_linting: true }, + lint: { + strict_updatability_linting: true, + }, } diff --git a/tests/benchmark/Android.bp b/tests/benchmark/Android.bp index 6ea53473b5..7854bb51e1 100644 --- a/tests/benchmark/Android.bp +++ b/tests/benchmark/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } @@ -40,4 +41,3 @@ android_test { test_suites: ["device-tests"], jarjar_rules: ":connectivity-jarjar-rules", } - diff --git a/tests/common/Android.bp b/tests/common/Android.bp index 7b5c298b5c..6e9d614381 100644 --- a/tests/common/Android.bp +++ b/tests/common/Android.bp @@ -17,6 +17,7 @@ // Tests in this folder are included both in unit tests and CTS. // They must be fast and stable, and exercise public or test APIs. package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } @@ -93,7 +94,10 @@ android_test { name: "ConnectivityCoverageTests", // Tethering started on SDK 30 min_sdk_version: "30", - test_suites: ["general-tests", "mts-tethering"], + test_suites: [ + "general-tests", + "mts-tethering", + ], defaults: [ "ConnectivityTestsLatestSdkDefaults", "framework-connectivity-internal-test-defaults", @@ -185,7 +189,7 @@ java_defaults { // See SuiteModuleLoader.java. // TODO: why are the modules separated by + instead of being separate entries in the array? mainline_presubmit_modules = [ - "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex", + "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex", ] cc_defaults { diff --git a/tests/cts/hostside/Android.bp b/tests/cts/hostside/Android.bp index 923f8e2805..0bfb062c31 100644 --- a/tests/cts/hostside/Android.bp +++ b/tests/cts/hostside/Android.bp @@ -23,6 +23,7 @@ next_app_data = [] package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -45,7 +46,7 @@ java_test_host { "general-tests", "mcts-tethering", "mts-tethering", - "sts" + "sts", ], data: [ ":CtsHostsideNetworkTestsApp", diff --git a/tests/cts/hostside/aidl/Android.bp b/tests/cts/hostside/aidl/Android.bp index 2751f6ff82..18a5897816 100644 --- a/tests/cts/hostside/aidl/Android.bp +++ b/tests/cts/hostside/aidl/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/hostside/app/Android.bp b/tests/cts/hostside/app/Android.bp index 470bb17a02..d5554915b1 100644 --- a/tests/cts/hostside/app/Android.bp +++ b/tests/cts/hostside/app/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/hostside/app2/Android.bp b/tests/cts/hostside/app2/Android.bp index db92f5c15a..c52617236d 100644 --- a/tests/cts/hostside/app2/Android.bp +++ b/tests/cts/hostside/app2/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/hostside/certs/Android.bp b/tests/cts/hostside/certs/Android.bp index 60b54769ea..301973ea20 100644 --- a/tests/cts/hostside/certs/Android.bp +++ b/tests/cts/hostside/certs/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/hostside/networkslicingtestapp/Android.bp b/tests/cts/hostside/networkslicingtestapp/Android.bp index 2aa3f6983f..100b6e4872 100644 --- a/tests/cts/hostside/networkslicingtestapp/Android.bp +++ b/tests/cts/hostside/networkslicingtestapp/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -39,8 +40,8 @@ java_defaults { android_test_helper_app { name: "CtsHostsideNetworkCapTestsAppWithoutProperty", defaults: [ - "cts_support_defaults", - "CtsHostsideNetworkCapTestsAppDefaults" + "cts_support_defaults", + "CtsHostsideNetworkCapTestsAppDefaults", ], manifest: "AndroidManifestWithoutProperty.xml", } @@ -48,8 +49,8 @@ android_test_helper_app { android_test_helper_app { name: "CtsHostsideNetworkCapTestsAppWithProperty", defaults: [ - "cts_support_defaults", - "CtsHostsideNetworkCapTestsAppDefaults" + "cts_support_defaults", + "CtsHostsideNetworkCapTestsAppDefaults", ], manifest: "AndroidManifestWithProperty.xml", } @@ -57,8 +58,8 @@ android_test_helper_app { android_test_helper_app { name: "CtsHostsideNetworkCapTestsAppSdk33", defaults: [ - "cts_support_defaults", - "CtsHostsideNetworkCapTestsAppDefaults" + "cts_support_defaults", + "CtsHostsideNetworkCapTestsAppDefaults", ], target_sdk_version: "33", manifest: "AndroidManifestWithoutProperty.xml", diff --git a/tests/cts/net/Android.bp b/tests/cts/net/Android.bp index f0e0ae87b4..98d56306ca 100644 --- a/tests/cts/net/Android.bp +++ b/tests/cts/net/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -69,7 +70,7 @@ java_defaults { data: [ ":ConnectivityTestPreparer", ":CtsCarrierServicePackage", - ] + ], } // Networking CTS tests for development and release. These tests always target the platform SDK diff --git a/tests/cts/net/api23Test/Android.bp b/tests/cts/net/api23Test/Android.bp index 1f1dd5db64..2ec3a707dc 100644 --- a/tests/cts/net/api23Test/Android.bp +++ b/tests/cts/net/api23Test/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/net/appForApi23/Android.bp b/tests/cts/net/appForApi23/Android.bp index b39690f14f..d3007438ab 100644 --- a/tests/cts/net/appForApi23/Android.bp +++ b/tests/cts/net/appForApi23/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/net/jni/Android.bp b/tests/cts/net/jni/Android.bp index a4213496e7..fbf4f29df5 100644 --- a/tests/cts/net/jni/Android.bp +++ b/tests/cts/net/jni/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/net/native/Android.bp b/tests/cts/net/native/Android.bp index 153ff51964..3f2459278c 100644 --- a/tests/cts/net/native/Android.bp +++ b/tests/cts/net/native/Android.bp @@ -15,6 +15,7 @@ // Build the unit tests. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/net/native/dns/Android.bp b/tests/cts/net/native/dns/Android.bp index a9e3715368..8e24fba686 100644 --- a/tests/cts/net/native/dns/Android.bp +++ b/tests/cts/net/native/dns/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/net/util/Android.bp b/tests/cts/net/util/Android.bp index fffd30f7e1..644634b9e1 100644 --- a/tests/cts/net/util/Android.bp +++ b/tests/cts/net/util/Android.bp @@ -16,12 +16,16 @@ // Common utilities for cts net tests. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } java_library { name: "cts-net-utils", - srcs: ["java/**/*.java", "java/**/*.kt"], + srcs: [ + "java/**/*.java", + "java/**/*.kt", + ], static_libs: [ "compatibility-device-util-axt", "junit", diff --git a/tests/cts/netpermission/internetpermission/Android.bp b/tests/cts/netpermission/internetpermission/Android.bp index 53143965db..7d5ca2f14c 100644 --- a/tests/cts/netpermission/internetpermission/Android.bp +++ b/tests/cts/netpermission/internetpermission/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/netpermission/updatestatspermission/Android.bp b/tests/cts/netpermission/updatestatspermission/Android.bp index 40474db3a0..2fde1ce992 100644 --- a/tests/cts/netpermission/updatestatspermission/Android.bp +++ b/tests/cts/netpermission/updatestatspermission/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/tethering/Android.bp b/tests/cts/tethering/Android.bp index 4284f56a91..392896167f 100644 --- a/tests/cts/tethering/Android.bp +++ b/tests/cts/tethering/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/deflake/Android.bp b/tests/deflake/Android.bp index 8205f1cf2f..726e504341 100644 --- a/tests/deflake/Android.bp +++ b/tests/deflake/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp index f705e34571..349529ddb0 100644 --- a/tests/integration/Android.bp +++ b/tests/integration/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } @@ -74,7 +75,10 @@ android_test { java_library { name: "frameworks-net-integration-testutils", defaults: ["framework-connectivity-test-defaults"], - srcs: ["util/**/*.java", "util/**/*.kt"], + srcs: [ + "util/**/*.java", + "util/**/*.kt", + ], static_libs: [ "androidx.annotation_annotation", "androidx.test.rules", diff --git a/tests/mts/Android.bp b/tests/mts/Android.bp index 64252235ce..336be2e081 100644 --- a/tests/mts/Android.bp +++ b/tests/mts/Android.bp @@ -14,6 +14,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -38,5 +39,5 @@ cc_test { "bpf_existence_test.cpp", ], compile_multilib: "first", - min_sdk_version: "30", // Ensure test runs on R and above. + min_sdk_version: "30", // Ensure test runs on R and above. } diff --git a/tests/native/connectivity_native_test/Android.bp b/tests/native/connectivity_native_test/Android.bp index 8825aa41e6..2f66d17c54 100644 --- a/tests/native/connectivity_native_test/Android.bp +++ b/tests/native/connectivity_native_test/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/native/utilities/Android.bp b/tests/native/utilities/Android.bp index 4706b3d869..2f761d7f85 100644 --- a/tests/native/utilities/Android.bp +++ b/tests/native/utilities/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -21,7 +22,7 @@ cc_test_library { name: "libconnectivity_native_test_utils", defaults: [ "netd_defaults", - "resolv_test_defaults" + "resolv_test_defaults", ], srcs: [ "firewall.cpp", diff --git a/tests/smoketest/Android.bp b/tests/smoketest/Android.bp index 4ab24fcb0a..121efa1a38 100644 --- a/tests/smoketest/Android.bp +++ b/tests/smoketest/Android.bp @@ -10,6 +10,7 @@ // TODO: remove this hack when there is a better solution for jni_libs that includes // dependent libraries. package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp index 8b286a07b3..4a1298f86f 100644 --- a/tests/unit/Android.bp +++ b/tests/unit/Android.bp @@ -2,6 +2,7 @@ // Build FrameworksNetTests package //######################################################################## package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "Android-Apache-2.0" @@ -73,7 +74,7 @@ filegroup { "java/com/android/server/connectivity/NetdEventListenerServiceTest.java", "java/com/android/server/connectivity/VpnTest.java", "java/com/android/server/net/ipmemorystore/*.java", - ] + ], } // Subset of services-core used to by ConnectivityService tests to test VPN realistically. @@ -115,7 +116,7 @@ java_defaults { "service-connectivity-tiramisu-pre-jarjar", "services.core-vpn", "testables", - "cts-net-utils" + "cts-net-utils", ], libs: [ "android.net.ipsec.ike.stubs.module_lib", diff --git a/tests/unit/jni/Android.bp b/tests/unit/jni/Android.bp index 616da81583..57a157d2fc 100644 --- a/tests/unit/jni/Android.bp +++ b/tests/unit/jni/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/apex/Android.bp b/thread/apex/Android.bp index 28854f2a4c..edf000aef5 100644 --- a/thread/apex/Android.bp +++ b/thread/apex/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/demoapp/Android.bp b/thread/demoapp/Android.bp index da7a5f81a4..fcfd469345 100644 --- a/thread/demoapp/Android.bp +++ b/thread/demoapp/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/framework/Android.bp b/thread/framework/Android.bp index cc598d8c2f..846253c856 100644 --- a/thread/framework/Android.bp +++ b/thread/framework/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/service/Android.bp b/thread/service/Android.bp index 013223517a..6e2fac1dc7 100644 --- a/thread/service/Android.bp +++ b/thread/service/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/tests/cts/Android.bp b/thread/tests/cts/Android.bp index 2f38bfdf98..81e24da297 100644 --- a/thread/tests/cts/Android.bp +++ b/thread/tests/cts/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/tests/integration/Android.bp b/thread/tests/integration/Android.bp index ebd6a4d7e0..5989db589b 100644 --- a/thread/tests/integration/Android.bp +++ b/thread/tests/integration/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/tests/unit/Android.bp b/thread/tests/unit/Android.bp index f59500e450..3365cd0ee0 100644 --- a/thread/tests/unit/Android.bp +++ b/thread/tests/unit/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tools/Android.bp b/tools/Android.bp index 3ce76f61e5..b7b2aaafd5 100644 --- a/tools/Android.bp +++ b/tools/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } From 71086be55e8d36faee11f6c20f291b101995143d Mon Sep 17 00:00:00 2001 From: Aditya Choudhary Date: Wed, 31 Jan 2024 11:08:57 +0000 Subject: [PATCH 14/19] [DON'T BLOCK] Test ownership migration rules This CL is created as a best effort to migrate test targets to the new android ownership model. If you find incorrect or unnecessary attribution in this CL, please create a separate CL to fix that. For more details please refer to the link below, Bug: 304529413 Test: N/A (cherry picked from https://android-review.googlesource.com/q/commit:a8ac702eb268d687d089ba218926ae6b17cda33c) Change-Id: I243f17b3f0ad7af9ffa15ca242456e36688733f5 Merged-In: I243f17b3f0ad7af9ffa15ca242456e36688733f5 --- Cronet/tests/common/Android.bp | 1 + Cronet/tests/cts/Android.bp | 5 +- Cronet/tests/mts/Android.bp | 1 + DnsResolver/Android.bp | 10 +- Tethering/Android.bp | 1 + Tethering/apex/Android.bp | 6 +- Tethering/apex/permissions/Android.bp | 3 +- Tethering/common/TetheringLib/Android.bp | 17 ++-- Tethering/tests/Android.bp | 3 +- Tethering/tests/integration/Android.bp | 7 +- Tethering/tests/mts/Android.bp | 1 + Tethering/tests/privileged/Android.bp | 1 + Tethering/tests/unit/Android.bp | 5 +- bpf_progs/Android.bp | 1 + clatd/Android.bp | 5 +- common/Android.bp | 1 + framework-t/Android.bp | 2 + framework/Android.bp | 1 + nearby/apex/Android.bp | 1 + nearby/framework/Android.bp | 1 + nearby/service/Android.bp | 1 + nearby/service/proto/Android.bp | 3 +- nearby/tests/cts/fastpair/Android.bp | 1 + .../tests/integration/privileged/Android.bp | 1 + nearby/tests/integration/untrusted/Android.bp | 1 + nearby/tests/unit/Android.bp | 1 + netbpfload/Android.bp | 4 + netd/Android.bp | 10 +- remoteauth/framework/Android.bp | 1 + remoteauth/service/Android.bp | 1 + remoteauth/service/jni/Android.bp | 1 + remoteauth/tests/unit/Android.bp | 1 + service-t/Android.bp | 1 + .../native/libs/libnetworkstats/Android.bp | 8 +- service/Android.bp | 1 + .../ServiceConnectivityResources/Android.bp | 1 + service/libconnectivity/Android.bp | 1 + service/native/libs/libclat/Android.bp | 6 +- staticlibs/Android.bp | 99 ++++++++++--------- staticlibs/client-libs/Android.bp | 9 +- staticlibs/client-libs/tests/unit/Android.bp | 3 +- staticlibs/native/bpf_headers/Android.bp | 1 + .../native/bpf_syscall_wrappers/Android.bp | 1 + staticlibs/native/bpfmapjni/Android.bp | 1 + staticlibs/native/bpfutiljni/Android.bp | 1 + staticlibs/native/ip_checksum/Android.bp | 1 + staticlibs/native/netjniutils/Android.bp | 1 + staticlibs/native/nettestutils/Android.bp | 1 + staticlibs/native/tcutils/Android.bp | 1 + staticlibs/netd/Android.bp | 1 + staticlibs/netd/libnetdutils/Android.bp | 6 +- staticlibs/tests/unit/Android.bp | 12 ++- staticlibs/testutils/Android.bp | 15 ++- .../app/connectivitychecker/Android.bp | 5 +- tests/benchmark/Android.bp | 2 +- tests/common/Android.bp | 8 +- tests/cts/hostside/Android.bp | 9 +- tests/cts/hostside/aidl/Android.bp | 1 + tests/cts/hostside/app/Android.bp | 1 + tests/cts/hostside/app2/Android.bp | 1 + tests/cts/hostside/certs/Android.bp | 1 + .../hostside/networkslicingtestapp/Android.bp | 13 +-- tests/cts/net/Android.bp | 3 +- tests/cts/net/api23Test/Android.bp | 1 + tests/cts/net/appForApi23/Android.bp | 1 + tests/cts/net/jni/Android.bp | 1 + tests/cts/net/native/Android.bp | 1 + tests/cts/net/native/dns/Android.bp | 1 + tests/cts/net/util/Android.bp | 6 +- .../internetpermission/Android.bp | 1 + .../updatestatspermission/Android.bp | 1 + tests/cts/tethering/Android.bp | 1 + tests/deflake/Android.bp | 1 + tests/integration/Android.bp | 6 +- tests/mts/Android.bp | 3 +- .../connectivity_native_test/Android.bp | 1 + tests/native/utilities/Android.bp | 3 +- tests/smoketest/Android.bp | 1 + tests/unit/Android.bp | 5 +- tests/unit/jni/Android.bp | 1 + thread/apex/Android.bp | 1 + thread/demoapp/Android.bp | 1 + thread/framework/Android.bp | 1 + thread/service/Android.bp | 1 + thread/tests/cts/Android.bp | 1 + thread/tests/integration/Android.bp | 1 + thread/tests/unit/Android.bp | 1 + tools/Android.bp | 1 + 88 files changed, 243 insertions(+), 114 deletions(-) diff --git a/Cronet/tests/common/Android.bp b/Cronet/tests/common/Android.bp index a484adb0e2..edeb0b3ebc 100644 --- a/Cronet/tests/common/Android.bp +++ b/Cronet/tests/common/Android.bp @@ -17,6 +17,7 @@ // They must be fast and stable, and exercise public or test APIs. package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/Cronet/tests/cts/Android.bp b/Cronet/tests/cts/Android.bp index 7b52694b1a..92b73d954c 100644 --- a/Cronet/tests/cts/Android.bp +++ b/Cronet/tests/cts/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -46,7 +47,9 @@ android_library { "framework-connectivity", "org.apache.http.legacy", ], - lint: { test: true } + lint: { + test: true, + }, } android_test { diff --git a/Cronet/tests/mts/Android.bp b/Cronet/tests/mts/Android.bp index 743a1cabe6..9486e1f0a4 100644 --- a/Cronet/tests/mts/Android.bp +++ b/Cronet/tests/mts/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/DnsResolver/Android.bp b/DnsResolver/Android.bp index d1330343f3..716eb101c5 100644 --- a/DnsResolver/Android.bp +++ b/DnsResolver/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -56,7 +57,10 @@ cc_library { cc_test { name: "dns_helper_unit_test", defaults: ["netd_defaults"], - test_suites: ["general-tests", "mts-tethering"], + test_suites: [ + "general-tests", + "mts-tethering", + ], test_config_template: ":net_native_test_config_template", header_libs: [ "bpf_connectivity_headers", @@ -68,8 +72,8 @@ cc_test { "libcom.android.tethering.dns_helper", ], shared_libs: [ - "libbase", - "libcutils", + "libbase", + "libcutils", ], compile_multilib: "both", multilib: { diff --git a/Tethering/Android.bp b/Tethering/Android.bp index ae3530542a..e2838fc343 100644 --- a/Tethering/Android.bp +++ b/Tethering/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp index de9017ae57..2a77f5739a 100644 --- a/Tethering/apex/Android.bp +++ b/Tethering/apex/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -24,6 +25,7 @@ java_defaults { name: "ConnectivityNextEnableDefaults", enabled: true, } + java_defaults { name: "NetworkStackApiShimSettingsForCurrentBranch", // API shims to include in the networking modules built from the branch. Branches that disable @@ -31,6 +33,7 @@ java_defaults { // (X_current API level). static_libs: ["NetworkStackApiCurrentShims"], } + apex_defaults { name: "ConnectivityApexDefaults", // Tethering app to include in the AOSP apex. Branches that disable the "next" targets may use @@ -38,6 +41,7 @@ apex_defaults { // package names and keys, so that apex will be unused anyway. apps: ["TetheringNext"], // Replace to "Tethering" if ConnectivityNextEnableDefaults is false. } + enable_tethering_next_apex = true // This is a placeholder comment to avoid merge conflicts // as the above target may have different "enabled" values @@ -92,7 +96,7 @@ apex { both: { jni_libs: [ "libframework-connectivity-jni", - "libframework-connectivity-tiramisu-jni" + "libframework-connectivity-tiramisu-jni", ], }, }, diff --git a/Tethering/apex/permissions/Android.bp b/Tethering/apex/permissions/Android.bp index 69c1aa2d4c..20772a8e09 100644 --- a/Tethering/apex/permissions/Android.bp +++ b/Tethering/apex/permissions/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], default_visibility: ["//packages/modules/Connectivity/Tethering:__subpackages__"], } @@ -22,4 +23,4 @@ package { filegroup { name: "privapp_allowlist_com.android.tethering", srcs: ["permissions.xml"], -} \ No newline at end of file +} diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp index bcea425c93..9c2a59dcd7 100644 --- a/Tethering/common/TetheringLib/Android.bp +++ b/Tethering/common/TetheringLib/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -55,14 +56,16 @@ java_sdk_library { hostdex: true, // for hiddenapi check permitted_packages: ["android.net"], - lint: { strict_updatability_linting: true }, + lint: { + strict_updatability_linting: true, + }, } java_library { - name: "framework-tethering-pre-jarjar", - defaults: [ - "framework-tethering-defaults", - ], + name: "framework-tethering-pre-jarjar", + defaults: [ + "framework-tethering-defaults", + ], } java_genrule { @@ -88,7 +91,7 @@ java_defaults { name: "framework-tethering-defaults", defaults: ["framework-module-defaults"], srcs: [ - ":framework-tethering-srcs" + ":framework-tethering-srcs", ], libs: ["framework-connectivity.stubs.module_lib"], aidl: { @@ -107,5 +110,5 @@ filegroup { "src/**/*.aidl", "src/**/*.java", ], - path: "src" + path: "src", } diff --git a/Tethering/tests/Android.bp b/Tethering/tests/Android.bp index 72ca666638..22cf3c5953 100644 --- a/Tethering/tests/Android.bp +++ b/Tethering/tests/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -24,5 +25,5 @@ filegroup { visibility: [ "//packages/modules/Connectivity/tests:__subpackages__", "//packages/modules/Connectivity/Tethering/tests:__subpackages__", - ] + ], } diff --git a/Tethering/tests/integration/Android.bp b/Tethering/tests/integration/Android.bp index 2594a5e13c..f17396d439 100644 --- a/Tethering/tests/integration/Android.bp +++ b/Tethering/tests/integration/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -50,7 +51,7 @@ android_library { visibility: [ "//packages/modules/Connectivity/Tethering/tests/mts", "//packages/modules/Connectivity/tests/cts/net", - ] + ], } // Library including tethering integration tests targeting the latest stable SDK. @@ -67,7 +68,7 @@ android_library { "//packages/modules/Connectivity/tests/cts/tethering", "//packages/modules/Connectivity/tests:__subpackages__", "//packages/modules/Connectivity/Tethering/tests:__subpackages__", - ] + ], } // Library including tethering integration tests targeting current development SDK. @@ -83,7 +84,7 @@ android_library { visibility: [ "//packages/modules/Connectivity/tests/cts/tethering", "//packages/modules/Connectivity/Tethering/tests/mts", - ] + ], } // TODO: remove because TetheringIntegrationTests has been covered by ConnectivityCoverageTests. diff --git a/Tethering/tests/mts/Android.bp b/Tethering/tests/mts/Android.bp index 4f4b03cb1e..a80e49e43d 100644 --- a/Tethering/tests/mts/Android.bp +++ b/Tethering/tests/mts/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/Tethering/tests/privileged/Android.bp b/Tethering/tests/privileged/Android.bp index c890197227..ba6be664c6 100644 --- a/Tethering/tests/privileged/Android.bp +++ b/Tethering/tests/privileged/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/Tethering/tests/unit/Android.bp b/Tethering/tests/unit/Android.bp index 36d9a6362d..24407ca57c 100644 --- a/Tethering/tests/unit/Android.bp +++ b/Tethering/tests/unit/Android.bp @@ -16,6 +16,7 @@ // Tests in this folder are included both in unit tests and CTS. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -23,7 +24,7 @@ java_library { name: "TetheringCommonTests", srcs: [ "common/**/*.java", - "common/**/*.kt" + "common/**/*.kt", ], static_libs: [ "androidx.test.rules", @@ -95,7 +96,7 @@ android_library { visibility: [ "//packages/modules/Connectivity/tests:__subpackages__", "//packages/modules/Connectivity/Tethering/tests:__subpackages__", - ] + ], } android_test { diff --git a/bpf_progs/Android.bp b/bpf_progs/Android.bp index cdf47e7da5..674cd98535 100644 --- a/bpf_progs/Android.bp +++ b/bpf_progs/Android.bp @@ -18,6 +18,7 @@ // struct definitions shared with JNI // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/clatd/Android.bp b/clatd/Android.bp index 595c6b924d..43eb2d8e59 100644 --- a/clatd/Android.bp +++ b/clatd/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["external_android-clat_license"], } @@ -54,7 +55,7 @@ cc_binary { defaults: ["clatd_defaults"], srcs: [ ":clatd_common", - "main.c" + "main.c", ], static_libs: [ "libip_checksum", @@ -101,7 +102,7 @@ cc_test { defaults: ["clatd_defaults"], srcs: [ ":clatd_common", - "clatd_test.cpp" + "clatd_test.cpp", ], static_libs: [ "libbase", diff --git a/common/Android.bp b/common/Android.bp index 69d12527f8..0048a0a59a 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/framework-t/Android.bp b/framework-t/Android.bp index b90d99f68f..f485a4472b 100644 --- a/framework-t/Android.bp +++ b/framework-t/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } @@ -34,6 +35,7 @@ java_defaults { name: "enable-framework-connectivity-t-targets", enabled: true, } + // The above defaults can be used to disable framework-connectivity t // targets while minimizing merge conflicts in the build rules. diff --git a/framework/Android.bp b/framework/Android.bp index a1d6a973e6..1356eea1ef 100644 --- a/framework/Android.bp +++ b/framework/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/apex/Android.bp b/nearby/apex/Android.bp index d7f063a662..5fdf5c95ac 100644 --- a/nearby/apex/Android.bp +++ b/nearby/apex/Android.bp @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/framework/Android.bp b/nearby/framework/Android.bp index 4bb9efdb81..0fd9a89372 100644 --- a/nearby/framework/Android.bp +++ b/nearby/framework/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/service/Android.bp b/nearby/service/Android.bp index 17b80b0d84..d34fd837ef 100644 --- a/nearby/service/Android.bp +++ b/nearby/service/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/service/proto/Android.bp b/nearby/service/proto/Android.bp index 1b00cf6784..be5a0b3c60 100644 --- a/nearby/service/proto/Android.bp +++ b/nearby/service/proto/Android.bp @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -41,4 +42,4 @@ java_library { apex_available: [ "com.android.tethering", ], -} \ No newline at end of file +} diff --git a/nearby/tests/cts/fastpair/Android.bp b/nearby/tests/cts/fastpair/Android.bp index 4309d7ed25..aa2806d1b7 100644 --- a/nearby/tests/cts/fastpair/Android.bp +++ b/nearby/tests/cts/fastpair/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/tests/integration/privileged/Android.bp b/nearby/tests/integration/privileged/Android.bp index 9b6e488029..5e6400974a 100644 --- a/nearby/tests/integration/privileged/Android.bp +++ b/nearby/tests/integration/privileged/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/tests/integration/untrusted/Android.bp b/nearby/tests/integration/untrusted/Android.bp index 75f765b67f..e6259c5a26 100644 --- a/nearby/tests/integration/untrusted/Android.bp +++ b/nearby/tests/integration/untrusted/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/tests/unit/Android.bp b/nearby/tests/unit/Android.bp index bbf42c7c9c..295056832c 100644 --- a/nearby/tests/unit/Android.bp +++ b/nearby/tests/unit/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/netbpfload/Android.bp b/netbpfload/Android.bp index 1f92374b83..037750ee43 100644 --- a/netbpfload/Android.bp +++ b/netbpfload/Android.bp @@ -14,6 +14,10 @@ // limitations under the License. // +package { + default_team: "trendy_team_fwk_core_networking", +} + cc_binary { name: "netbpfload", diff --git a/netd/Android.bp b/netd/Android.bp index 3cdbc9780c..eedbdae504 100644 --- a/netd/Android.bp +++ b/netd/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -58,15 +59,18 @@ cc_library { cc_test { name: "netd_updatable_unit_test", defaults: ["netd_defaults"], - test_suites: ["general-tests", "mts-tethering"], + test_suites: [ + "general-tests", + "mts-tethering", + ], test_config_template: ":net_native_test_config_template", - require_root: true, // required by setrlimitForTest() + require_root: true, // required by setrlimitForTest() header_libs: [ "bpf_connectivity_headers", ], srcs: [ "BpfHandlerTest.cpp", - "BpfBaseTest.cpp" + "BpfBaseTest.cpp", ], static_libs: [ "libbase", diff --git a/remoteauth/framework/Android.bp b/remoteauth/framework/Android.bp index 71b621a3ec..2f1737f346 100644 --- a/remoteauth/framework/Android.bp +++ b/remoteauth/framework/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/remoteauth/service/Android.bp b/remoteauth/service/Android.bp index 8330efc1da..32ae54f5b6 100644 --- a/remoteauth/service/Android.bp +++ b/remoteauth/service/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/remoteauth/service/jni/Android.bp b/remoteauth/service/jni/Android.bp index a95a8fb90d..c0ac7799fc 100644 --- a/remoteauth/service/jni/Android.bp +++ b/remoteauth/service/jni/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/remoteauth/tests/unit/Android.bp b/remoteauth/tests/unit/Android.bp index 77e6f19368..47b9e31c89 100644 --- a/remoteauth/tests/unit/Android.bp +++ b/remoteauth/tests/unit/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/service-t/Android.bp b/service-t/Android.bp index 78c7d35531..19850fd19c 100644 --- a/service-t/Android.bp +++ b/service-t/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/service-t/native/libs/libnetworkstats/Android.bp b/service-t/native/libs/libnetworkstats/Android.bp index b9f3adb91c..c62063404a 100644 --- a/service-t/native/libs/libnetworkstats/Android.bp +++ b/service-t/native/libs/libnetworkstats/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -57,9 +58,12 @@ cc_library { cc_test { name: "libnetworkstats_test", - test_suites: ["general-tests", "mts-tethering"], + test_suites: [ + "general-tests", + "mts-tethering", + ], test_config_template: ":net_native_test_config_template", - require_root: true, // required by setrlimitForTest() + require_root: true, // required by setrlimitForTest() header_libs: ["bpf_connectivity_headers"], srcs: [ "BpfNetworkStatsTest.cpp", diff --git a/service/Android.bp b/service/Android.bp index ab85cc1078..c6ecaddf21 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/service/ServiceConnectivityResources/Android.bp b/service/ServiceConnectivityResources/Android.bp index 2260596565..2621256f01 100644 --- a/service/ServiceConnectivityResources/Android.bp +++ b/service/ServiceConnectivityResources/Android.bp @@ -16,6 +16,7 @@ // APK to hold all the wifi overlayable resources. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/service/libconnectivity/Android.bp b/service/libconnectivity/Android.bp index e063af7ce6..3a72134e07 100644 --- a/service/libconnectivity/Android.bp +++ b/service/libconnectivity/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/service/native/libs/libclat/Android.bp b/service/native/libs/libclat/Android.bp index 5c6b12395d..6c1c2c4b2d 100644 --- a/service/native/libs/libclat/Android.bp +++ b/service/native/libs/libclat/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -38,7 +39,10 @@ cc_library_static { cc_test { name: "libclat_test", defaults: ["netd_defaults"], - test_suites: ["general-tests", "mts-tethering"], + test_suites: [ + "general-tests", + "mts-tethering", + ], test_config_template: ":net_native_test_config_template", srcs: [ "clatutils_test.cpp", diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp index 8f018c004f..3cbabcce0d 100644 --- a/staticlibs/Android.bp +++ b/staticlibs/Android.bp @@ -28,34 +28,35 @@ // though they are not in the current.txt files. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } java_library { - name: "net-utils-device-common", - srcs: [ - "device/com/android/net/module/util/arp/ArpPacket.java", - "device/com/android/net/module/util/DeviceConfigUtils.java", - "device/com/android/net/module/util/DomainUtils.java", - "device/com/android/net/module/util/FdEventsReader.java", - "device/com/android/net/module/util/NetworkMonitorUtils.java", - "device/com/android/net/module/util/PacketReader.java", - "device/com/android/net/module/util/SharedLog.java", - "device/com/android/net/module/util/SocketUtils.java", - "device/com/android/net/module/util/FeatureVersions.java", - "device/com/android/net/module/util/HandlerUtils.java", - // This library is used by system modules, for which the system health impact of Kotlin - // has not yet been evaluated. Annotations may need jarjar'ing. - // "src_devicecommon/**/*.kt", - ], - sdk_version: "module_current", - min_sdk_version: "30", - target_sdk_version: "30", - apex_available: [ - "//apex_available:anyapex", - "//apex_available:platform", - ], - visibility: [ + name: "net-utils-device-common", + srcs: [ + "device/com/android/net/module/util/arp/ArpPacket.java", + "device/com/android/net/module/util/DeviceConfigUtils.java", + "device/com/android/net/module/util/DomainUtils.java", + "device/com/android/net/module/util/FdEventsReader.java", + "device/com/android/net/module/util/NetworkMonitorUtils.java", + "device/com/android/net/module/util/PacketReader.java", + "device/com/android/net/module/util/SharedLog.java", + "device/com/android/net/module/util/SocketUtils.java", + "device/com/android/net/module/util/FeatureVersions.java", + "device/com/android/net/module/util/HandlerUtils.java", + // This library is used by system modules, for which the system health impact of Kotlin + // has not yet been evaluated. Annotations may need jarjar'ing. + // "src_devicecommon/**/*.kt", + ], + sdk_version: "module_current", + min_sdk_version: "30", + target_sdk_version: "30", + apex_available: [ + "//apex_available:anyapex", + "//apex_available:platform", + ], + visibility: [ "//frameworks/base/packages/Tethering", "//packages/modules/Connectivity:__subpackages__", "//packages/modules/Connectivity/framework:__subpackages__", @@ -65,26 +66,26 @@ java_library { "//frameworks/opt/net/telephony", "//packages/modules/NetworkStack:__subpackages__", "//packages/modules/CaptivePortalLogin", - ], - static_libs: [ - "net-utils-framework-common", - ], - libs: [ - "androidx.annotation_annotation", - "framework-annotations-lib", - "framework-configinfrastructure", - "framework-connectivity.stubs.module_lib", - ], - lint: { - strict_updatability_linting: true, - error_checks: ["NewApi"], - }, + ], + static_libs: [ + "net-utils-framework-common", + ], + libs: [ + "androidx.annotation_annotation", + "framework-annotations-lib", + "framework-configinfrastructure", + "framework-connectivity.stubs.module_lib", + ], + lint: { + strict_updatability_linting: true, + error_checks: ["NewApi"], + }, } java_defaults { name: "lib_mockito_extended", static_libs: [ - "mockito-target-extended-minus-junit4" + "mockito-target-extended-minus-junit4", ], jni_libs: [ "libdexmakerjvmtiagent", @@ -95,12 +96,12 @@ java_defaults { java_library { name: "net-utils-dnspacket-common", srcs: [ - "framework/**/DnsPacket.java", - "framework/**/DnsPacketUtils.java", - "framework/**/DnsSvcbPacket.java", - "framework/**/DnsSvcbRecord.java", - "framework/**/HexDump.java", - "framework/**/NetworkStackConstants.java", + "framework/**/DnsPacket.java", + "framework/**/DnsPacketUtils.java", + "framework/**/DnsSvcbPacket.java", + "framework/**/DnsSvcbRecord.java", + "framework/**/HexDump.java", + "framework/**/NetworkStackConstants.java", ], sdk_version: "module_current", visibility: [ @@ -464,10 +465,10 @@ filegroup { filegroup { name: "net-utils-wifi-service-common-srcs", srcs: [ - "device/android/net/NetworkFactory.java", - "device/android/net/NetworkFactoryImpl.java", - "device/android/net/NetworkFactoryLegacyImpl.java", - "device/android/net/NetworkFactoryShim.java", + "device/android/net/NetworkFactory.java", + "device/android/net/NetworkFactoryImpl.java", + "device/android/net/NetworkFactoryLegacyImpl.java", + "device/android/net/NetworkFactoryShim.java", ], visibility: [ "//frameworks/opt/net/wifi/service", diff --git a/staticlibs/client-libs/Android.bp b/staticlibs/client-libs/Android.bp index c938dd613d..f665584f83 100644 --- a/staticlibs/client-libs/Android.bp +++ b/staticlibs/client-libs/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -10,17 +11,17 @@ java_library { apex_available: [ "//apex_available:platform", "com.android.tethering", - "com.android.wifi" + "com.android.wifi", ], visibility: [ "//packages/modules/Connectivity:__subpackages__", "//frameworks/base/services:__subpackages__", "//frameworks/base/packages:__subpackages__", - "//packages/modules/Wifi/service:__subpackages__" + "//packages/modules/Wifi/service:__subpackages__", ], libs: ["androidx.annotation_annotation"], static_libs: [ "netd_aidl_interface-lateststable-java", - "netd_event_listener_interface-lateststable-java" - ] + "netd_event_listener_interface-lateststable-java", + ], } diff --git a/staticlibs/client-libs/tests/unit/Android.bp b/staticlibs/client-libs/tests/unit/Android.bp index 03e3e70054..7aafd69c58 100644 --- a/staticlibs/client-libs/tests/unit/Android.bp +++ b/staticlibs/client-libs/tests/unit/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -26,7 +27,7 @@ android_library { "//packages/modules/Connectivity/tests:__subpackages__", "//packages/modules/Connectivity/Tethering/tests:__subpackages__", "//packages/modules/NetworkStack/tests/integration", - ] + ], } android_test { diff --git a/staticlibs/native/bpf_headers/Android.bp b/staticlibs/native/bpf_headers/Android.bp index 41184ea48e..d55584ac59 100644 --- a/staticlibs/native/bpf_headers/Android.bp +++ b/staticlibs/native/bpf_headers/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/bpf_syscall_wrappers/Android.bp b/staticlibs/native/bpf_syscall_wrappers/Android.bp index b3efc21668..1e0cb224a5 100644 --- a/staticlibs/native/bpf_syscall_wrappers/Android.bp +++ b/staticlibs/native/bpf_syscall_wrappers/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/bpfmapjni/Android.bp b/staticlibs/native/bpfmapjni/Android.bp index 8babcce3f7..7e6b4ec452 100644 --- a/staticlibs/native/bpfmapjni/Android.bp +++ b/staticlibs/native/bpfmapjni/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/bpfutiljni/Android.bp b/staticlibs/native/bpfutiljni/Android.bp index 39a2795086..1ef01a67de 100644 --- a/staticlibs/native/bpfutiljni/Android.bp +++ b/staticlibs/native/bpfutiljni/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/ip_checksum/Android.bp b/staticlibs/native/ip_checksum/Android.bp index 9878d73771..e2e118e822 100644 --- a/staticlibs/native/ip_checksum/Android.bp +++ b/staticlibs/native/ip_checksum/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/netjniutils/Android.bp b/staticlibs/native/netjniutils/Android.bp index ca3bbbc0a1..4cab45907b 100644 --- a/staticlibs/native/netjniutils/Android.bp +++ b/staticlibs/native/netjniutils/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/nettestutils/Android.bp b/staticlibs/native/nettestutils/Android.bp index df3bb4288c..ef87f04ca7 100644 --- a/staticlibs/native/nettestutils/Android.bp +++ b/staticlibs/native/nettestutils/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/tcutils/Android.bp b/staticlibs/native/tcutils/Android.bp index 9a38745c69..926590d24a 100644 --- a/staticlibs/native/tcutils/Android.bp +++ b/staticlibs/native/tcutils/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/netd/Android.bp b/staticlibs/netd/Android.bp index 2b7e620705..59ef20d34a 100644 --- a/staticlibs/netd/Android.bp +++ b/staticlibs/netd/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/netd/libnetdutils/Android.bp b/staticlibs/netd/libnetdutils/Android.bp index fdb9380d4f..2ae5911ecf 100644 --- a/staticlibs/netd/libnetdutils/Android.bp +++ b/staticlibs/netd/libnetdutils/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -22,7 +23,10 @@ cc_library { "Utils.cpp", ], defaults: ["netd_defaults"], - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], shared_libs: [ "libbase", "liblog", diff --git a/staticlibs/tests/unit/Android.bp b/staticlibs/tests/unit/Android.bp index 0dfca57f44..d203bc0a0b 100644 --- a/staticlibs/tests/unit/Android.bp +++ b/staticlibs/tests/unit/Android.bp @@ -3,12 +3,16 @@ //######################################################################## package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } android_library { name: "NetworkStaticLibTestsLib", - srcs: ["src/**/*.java","src/**/*.kt"], + srcs: [ + "src/**/*.java", + "src/**/*.kt", + ], min_sdk_version: "30", defaults: ["framework-connectivity-test-defaults"], static_libs: [ @@ -35,7 +39,7 @@ android_library { ], lint: { strict_updatability_linting: true, - test: true + test: true, }, } @@ -52,5 +56,7 @@ android_test { ], jarjar_rules: "jarjar-rules.txt", test_suites: ["device-tests"], - lint: { strict_updatability_linting: true }, + lint: { + strict_updatability_linting: true, + }, } diff --git a/staticlibs/testutils/Android.bp b/staticlibs/testutils/Android.bp index 43853ee463..a8e5a69e02 100644 --- a/staticlibs/testutils/Android.bp +++ b/staticlibs/testutils/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -24,11 +25,11 @@ java_library { ], defaults: [ "framework-connectivity-test-defaults", - "lib_mockito_extended" + "lib_mockito_extended", ], libs: [ "androidx.annotation_annotation", - "net-utils-device-common-bpf", // TestBpfMap extends IBpfMap. + "net-utils-device-common-bpf", // TestBpfMap extends IBpfMap. ], static_libs: [ "androidx.test.ext.junit", @@ -42,7 +43,9 @@ java_library { "net-utils-device-common-wear", "modules-utils-build_system", ], - lint: { strict_updatability_linting: true }, + lint: { + strict_updatability_linting: true, + }, } java_library { @@ -72,9 +75,11 @@ java_library { "jsr305", ], static_libs: [ - "kotlin-test" + "kotlin-test", ], - lint: { strict_updatability_linting: true }, + lint: { + strict_updatability_linting: true, + }, } java_test_host { diff --git a/staticlibs/testutils/app/connectivitychecker/Android.bp b/staticlibs/testutils/app/connectivitychecker/Android.bp index 049ec9e1b7..5af8c147f9 100644 --- a/staticlibs/testutils/app/connectivitychecker/Android.bp +++ b/staticlibs/testutils/app/connectivitychecker/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -30,5 +31,7 @@ android_test_helper_app { "net-tests-utils", ], host_required: ["net-tests-utils-host-common"], - lint: { strict_updatability_linting: true }, + lint: { + strict_updatability_linting: true, + }, } diff --git a/tests/benchmark/Android.bp b/tests/benchmark/Android.bp index 6ea53473b5..7854bb51e1 100644 --- a/tests/benchmark/Android.bp +++ b/tests/benchmark/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } @@ -40,4 +41,3 @@ android_test { test_suites: ["device-tests"], jarjar_rules: ":connectivity-jarjar-rules", } - diff --git a/tests/common/Android.bp b/tests/common/Android.bp index 7b5c298b5c..6e9d614381 100644 --- a/tests/common/Android.bp +++ b/tests/common/Android.bp @@ -17,6 +17,7 @@ // Tests in this folder are included both in unit tests and CTS. // They must be fast and stable, and exercise public or test APIs. package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } @@ -93,7 +94,10 @@ android_test { name: "ConnectivityCoverageTests", // Tethering started on SDK 30 min_sdk_version: "30", - test_suites: ["general-tests", "mts-tethering"], + test_suites: [ + "general-tests", + "mts-tethering", + ], defaults: [ "ConnectivityTestsLatestSdkDefaults", "framework-connectivity-internal-test-defaults", @@ -185,7 +189,7 @@ java_defaults { // See SuiteModuleLoader.java. // TODO: why are the modules separated by + instead of being separate entries in the array? mainline_presubmit_modules = [ - "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex", + "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex", ] cc_defaults { diff --git a/tests/cts/hostside/Android.bp b/tests/cts/hostside/Android.bp index a0aafc642a..2688fb8ff9 100644 --- a/tests/cts/hostside/Android.bp +++ b/tests/cts/hostside/Android.bp @@ -12,17 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -next_app_data = [ ":CtsHostsideNetworkTestsAppNext" ] +next_app_data = [":CtsHostsideNetworkTestsAppNext"] // The above line is put in place to prevent any future automerger merge conflict between aosp, // downstream branches. The CtsHostsideNetworkTestsAppNext target will not exist in // some downstream branches, but it should exist in aosp and some downstream branches. - - - - package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -45,7 +42,7 @@ java_test_host { "general-tests", "mcts-tethering", "mts-tethering", - "sts" + "sts", ], data: [ ":CtsHostsideNetworkTestsApp", diff --git a/tests/cts/hostside/aidl/Android.bp b/tests/cts/hostside/aidl/Android.bp index 2751f6ff82..18a5897816 100644 --- a/tests/cts/hostside/aidl/Android.bp +++ b/tests/cts/hostside/aidl/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/hostside/app/Android.bp b/tests/cts/hostside/app/Android.bp index 470bb17a02..d5554915b1 100644 --- a/tests/cts/hostside/app/Android.bp +++ b/tests/cts/hostside/app/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/hostside/app2/Android.bp b/tests/cts/hostside/app2/Android.bp index db92f5c15a..c52617236d 100644 --- a/tests/cts/hostside/app2/Android.bp +++ b/tests/cts/hostside/app2/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/hostside/certs/Android.bp b/tests/cts/hostside/certs/Android.bp index 60b54769ea..301973ea20 100644 --- a/tests/cts/hostside/certs/Android.bp +++ b/tests/cts/hostside/certs/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/hostside/networkslicingtestapp/Android.bp b/tests/cts/hostside/networkslicingtestapp/Android.bp index 2aa3f6983f..100b6e4872 100644 --- a/tests/cts/hostside/networkslicingtestapp/Android.bp +++ b/tests/cts/hostside/networkslicingtestapp/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -39,8 +40,8 @@ java_defaults { android_test_helper_app { name: "CtsHostsideNetworkCapTestsAppWithoutProperty", defaults: [ - "cts_support_defaults", - "CtsHostsideNetworkCapTestsAppDefaults" + "cts_support_defaults", + "CtsHostsideNetworkCapTestsAppDefaults", ], manifest: "AndroidManifestWithoutProperty.xml", } @@ -48,8 +49,8 @@ android_test_helper_app { android_test_helper_app { name: "CtsHostsideNetworkCapTestsAppWithProperty", defaults: [ - "cts_support_defaults", - "CtsHostsideNetworkCapTestsAppDefaults" + "cts_support_defaults", + "CtsHostsideNetworkCapTestsAppDefaults", ], manifest: "AndroidManifestWithProperty.xml", } @@ -57,8 +58,8 @@ android_test_helper_app { android_test_helper_app { name: "CtsHostsideNetworkCapTestsAppSdk33", defaults: [ - "cts_support_defaults", - "CtsHostsideNetworkCapTestsAppDefaults" + "cts_support_defaults", + "CtsHostsideNetworkCapTestsAppDefaults", ], target_sdk_version: "33", manifest: "AndroidManifestWithoutProperty.xml", diff --git a/tests/cts/net/Android.bp b/tests/cts/net/Android.bp index f0e0ae87b4..98d56306ca 100644 --- a/tests/cts/net/Android.bp +++ b/tests/cts/net/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -69,7 +70,7 @@ java_defaults { data: [ ":ConnectivityTestPreparer", ":CtsCarrierServicePackage", - ] + ], } // Networking CTS tests for development and release. These tests always target the platform SDK diff --git a/tests/cts/net/api23Test/Android.bp b/tests/cts/net/api23Test/Android.bp index 1f1dd5db64..2ec3a707dc 100644 --- a/tests/cts/net/api23Test/Android.bp +++ b/tests/cts/net/api23Test/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/net/appForApi23/Android.bp b/tests/cts/net/appForApi23/Android.bp index b39690f14f..d3007438ab 100644 --- a/tests/cts/net/appForApi23/Android.bp +++ b/tests/cts/net/appForApi23/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/net/jni/Android.bp b/tests/cts/net/jni/Android.bp index a4213496e7..fbf4f29df5 100644 --- a/tests/cts/net/jni/Android.bp +++ b/tests/cts/net/jni/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/net/native/Android.bp b/tests/cts/net/native/Android.bp index 153ff51964..3f2459278c 100644 --- a/tests/cts/net/native/Android.bp +++ b/tests/cts/net/native/Android.bp @@ -15,6 +15,7 @@ // Build the unit tests. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/net/native/dns/Android.bp b/tests/cts/net/native/dns/Android.bp index a9e3715368..8e24fba686 100644 --- a/tests/cts/net/native/dns/Android.bp +++ b/tests/cts/net/native/dns/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/net/util/Android.bp b/tests/cts/net/util/Android.bp index fffd30f7e1..644634b9e1 100644 --- a/tests/cts/net/util/Android.bp +++ b/tests/cts/net/util/Android.bp @@ -16,12 +16,16 @@ // Common utilities for cts net tests. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } java_library { name: "cts-net-utils", - srcs: ["java/**/*.java", "java/**/*.kt"], + srcs: [ + "java/**/*.java", + "java/**/*.kt", + ], static_libs: [ "compatibility-device-util-axt", "junit", diff --git a/tests/cts/netpermission/internetpermission/Android.bp b/tests/cts/netpermission/internetpermission/Android.bp index 53143965db..7d5ca2f14c 100644 --- a/tests/cts/netpermission/internetpermission/Android.bp +++ b/tests/cts/netpermission/internetpermission/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/netpermission/updatestatspermission/Android.bp b/tests/cts/netpermission/updatestatspermission/Android.bp index 40474db3a0..2fde1ce992 100644 --- a/tests/cts/netpermission/updatestatspermission/Android.bp +++ b/tests/cts/netpermission/updatestatspermission/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/tethering/Android.bp b/tests/cts/tethering/Android.bp index 4284f56a91..392896167f 100644 --- a/tests/cts/tethering/Android.bp +++ b/tests/cts/tethering/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/deflake/Android.bp b/tests/deflake/Android.bp index 8205f1cf2f..726e504341 100644 --- a/tests/deflake/Android.bp +++ b/tests/deflake/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp index f705e34571..349529ddb0 100644 --- a/tests/integration/Android.bp +++ b/tests/integration/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } @@ -74,7 +75,10 @@ android_test { java_library { name: "frameworks-net-integration-testutils", defaults: ["framework-connectivity-test-defaults"], - srcs: ["util/**/*.java", "util/**/*.kt"], + srcs: [ + "util/**/*.java", + "util/**/*.kt", + ], static_libs: [ "androidx.annotation_annotation", "androidx.test.rules", diff --git a/tests/mts/Android.bp b/tests/mts/Android.bp index 64252235ce..336be2e081 100644 --- a/tests/mts/Android.bp +++ b/tests/mts/Android.bp @@ -14,6 +14,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -38,5 +39,5 @@ cc_test { "bpf_existence_test.cpp", ], compile_multilib: "first", - min_sdk_version: "30", // Ensure test runs on R and above. + min_sdk_version: "30", // Ensure test runs on R and above. } diff --git a/tests/native/connectivity_native_test/Android.bp b/tests/native/connectivity_native_test/Android.bp index 8825aa41e6..2f66d17c54 100644 --- a/tests/native/connectivity_native_test/Android.bp +++ b/tests/native/connectivity_native_test/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/native/utilities/Android.bp b/tests/native/utilities/Android.bp index 4706b3d869..2f761d7f85 100644 --- a/tests/native/utilities/Android.bp +++ b/tests/native/utilities/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -21,7 +22,7 @@ cc_test_library { name: "libconnectivity_native_test_utils", defaults: [ "netd_defaults", - "resolv_test_defaults" + "resolv_test_defaults", ], srcs: [ "firewall.cpp", diff --git a/tests/smoketest/Android.bp b/tests/smoketest/Android.bp index 4ab24fcb0a..121efa1a38 100644 --- a/tests/smoketest/Android.bp +++ b/tests/smoketest/Android.bp @@ -10,6 +10,7 @@ // TODO: remove this hack when there is a better solution for jni_libs that includes // dependent libraries. package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp index 8b286a07b3..4a1298f86f 100644 --- a/tests/unit/Android.bp +++ b/tests/unit/Android.bp @@ -2,6 +2,7 @@ // Build FrameworksNetTests package //######################################################################## package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "Android-Apache-2.0" @@ -73,7 +74,7 @@ filegroup { "java/com/android/server/connectivity/NetdEventListenerServiceTest.java", "java/com/android/server/connectivity/VpnTest.java", "java/com/android/server/net/ipmemorystore/*.java", - ] + ], } // Subset of services-core used to by ConnectivityService tests to test VPN realistically. @@ -115,7 +116,7 @@ java_defaults { "service-connectivity-tiramisu-pre-jarjar", "services.core-vpn", "testables", - "cts-net-utils" + "cts-net-utils", ], libs: [ "android.net.ipsec.ike.stubs.module_lib", diff --git a/tests/unit/jni/Android.bp b/tests/unit/jni/Android.bp index 616da81583..57a157d2fc 100644 --- a/tests/unit/jni/Android.bp +++ b/tests/unit/jni/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/apex/Android.bp b/thread/apex/Android.bp index 28854f2a4c..edf000aef5 100644 --- a/thread/apex/Android.bp +++ b/thread/apex/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/demoapp/Android.bp b/thread/demoapp/Android.bp index da7a5f81a4..fcfd469345 100644 --- a/thread/demoapp/Android.bp +++ b/thread/demoapp/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/framework/Android.bp b/thread/framework/Android.bp index cc598d8c2f..846253c856 100644 --- a/thread/framework/Android.bp +++ b/thread/framework/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/service/Android.bp b/thread/service/Android.bp index 013223517a..6e2fac1dc7 100644 --- a/thread/service/Android.bp +++ b/thread/service/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/tests/cts/Android.bp b/thread/tests/cts/Android.bp index 38d2255a3d..67eef07aff 100644 --- a/thread/tests/cts/Android.bp +++ b/thread/tests/cts/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/tests/integration/Android.bp b/thread/tests/integration/Android.bp index ebd6a4d7e0..5989db589b 100644 --- a/thread/tests/integration/Android.bp +++ b/thread/tests/integration/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/tests/unit/Android.bp b/thread/tests/unit/Android.bp index f59500e450..3365cd0ee0 100644 --- a/thread/tests/unit/Android.bp +++ b/thread/tests/unit/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tools/Android.bp b/tools/Android.bp index 3ce76f61e5..b7b2aaafd5 100644 --- a/tools/Android.bp +++ b/tools/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } From cfbc76fc0b5ac706aaf6d73a7f929e1ee5864a3d Mon Sep 17 00:00:00 2001 From: Kangping Dong Date: Fri, 2 Feb 2024 08:21:47 +0000 Subject: [PATCH 15/19] Revert "[Thread] remove CtsThreadNetworkTestCases from CTS test suite" This reverts commit f0aa3bd7447a222efc18c51f5a4e533140f20a75. Reason for revert: the root cause is actually because the test suite & mainline prebuilt used for the next build don't match, it's fixed by b/301574392 so we should revert this CL. This revert will fix the API coverage issue b/323464756 Bug: 323464756 Change-Id: I07d78c0d375370aa83024e3e154b7841a5018e64 --- thread/tests/cts/Android.bp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/thread/tests/cts/Android.bp b/thread/tests/cts/Android.bp index 2afb269855..ce770e0875 100644 --- a/thread/tests/cts/Android.bp +++ b/thread/tests/cts/Android.bp @@ -18,9 +18,9 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } -// TODO: add this test to the CTS test suite android_test { name: "CtsThreadNetworkTestCases", + defaults: ["cts_defaults"], min_sdk_version: "33", sdk_version: "test_current", manifest: "AndroidManifest.xml", @@ -29,6 +29,7 @@ android_test { "src/**/*.java", ], test_suites: [ + "cts", "general-tests", "mts-tethering", ], From 5c20bfae00cdfda94cce3968a158b8795ccd0b0d Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Fri, 2 Feb 2024 11:42:21 -0800 Subject: [PATCH 16/19] Readd NewApi error To make this consistent with aosp. Bug: 320698986 Test: Presubmits Change-Id: If7df796a7cbc38ef3c9f4327ffaf183af8bd1b8b --- Tethering/Android.bp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Tethering/Android.bp b/Tethering/Android.bp index e2838fc343..e4e6c707e8 100644 --- a/Tethering/Android.bp +++ b/Tethering/Android.bp @@ -82,6 +82,9 @@ java_defaults { "framework-tethering.impl", ], manifest: "AndroidManifestBase.xml", + lint: { + error_checks: ["NewApi"], + }, } // build tethering static library, used to compile both variants of the tethering. From 14a728b576659c17edd95d011a05a79393af5065 Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Fri, 16 Feb 2024 21:49:16 +0900 Subject: [PATCH 17/19] Remove register_nsd_offload_engine flag from module flags.aconfig register_nsd_offload_engine is moved to platform flags.aconfig since this flag is used from platform and not used from module Test: TH Bug: 325591785 Merged-In: aosp/2967005 Change-Id: If8a8426dbbb10253fd5046f639de13519396ddac --- common/flags.aconfig | 7 ------- 1 file changed, 7 deletions(-) diff --git a/common/flags.aconfig b/common/flags.aconfig index 965354d8b3..b6cabb2a62 100644 --- a/common/flags.aconfig +++ b/common/flags.aconfig @@ -32,13 +32,6 @@ flag { bug: "304347838" } -flag { - name: "register_nsd_offload_engine" - namespace: "android_core_networking" - description: "The flag controls the access for registerOffloadEngine API in NsdManager" - bug: "294777050" -} - flag { name: "ipsec_transform_state" namespace: "android_core_networking_ipsec" From 7fd35e54a8a8379a9fcdac378b29a77c8f26bae6 Mon Sep 17 00:00:00 2001 From: Kangping Dong Date: Thu, 22 Feb 2024 10:59:36 +0800 Subject: [PATCH 18/19] [Thread] add Thread aconfig_declaration to java_sdk_library This commit also moves Thread flags to Connectivity/common to ease maintenance. Test: m framework-connectivity-t Ignore-AOSP-First: cherry-pick of aosp/2971692 Bug: 317290555 Merged-In: I79be1b48058ce6fb08149e18cdd7a5f5b0762769 Change-Id: I8a71f4ee49cc68a9512f432e454469200f2a5058 --- common/FlaggedApi.bp | 8 ++++++++ common/OWNERS | 1 + .../thread_base.aconfig => common/thread_flags.aconfig | 0 framework-t/Android.bp | 1 + 4 files changed, 10 insertions(+) create mode 100644 common/OWNERS rename thread/flags/thread_base.aconfig => common/thread_flags.aconfig (100%) diff --git a/common/FlaggedApi.bp b/common/FlaggedApi.bp index 449d7ae77e..56625c5185 100644 --- a/common/FlaggedApi.bp +++ b/common/FlaggedApi.bp @@ -22,6 +22,14 @@ aconfig_declarations { visibility: ["//packages/modules/Connectivity:__subpackages__"], } +aconfig_declarations { + name: "com.android.net.thread.flags-aconfig", + package: "com.android.net.thread.flags", + container: "system", + srcs: ["thread_flags.aconfig"], + visibility: ["//packages/modules/Connectivity:__subpackages__"], +} + aconfig_declarations { name: "nearby_flags", package: "com.android.nearby.flags", diff --git a/common/OWNERS b/common/OWNERS new file mode 100644 index 0000000000..e7f5d11f73 --- /dev/null +++ b/common/OWNERS @@ -0,0 +1 @@ +per-file thread_flags.aconfig = file:platform/packages/modules/Connectivity:main:/thread/OWNERS diff --git a/thread/flags/thread_base.aconfig b/common/thread_flags.aconfig similarity index 100% rename from thread/flags/thread_base.aconfig rename to common/thread_flags.aconfig diff --git a/framework-t/Android.bp b/framework-t/Android.bp index ad9d094232..9bcdbdd186 100644 --- a/framework-t/Android.bp +++ b/framework-t/Android.bp @@ -197,6 +197,7 @@ java_sdk_library { ], aconfig_declarations: [ "com.android.net.flags-aconfig", + "com.android.net.thread.flags-aconfig", "nearby_flags", ], } From 0117a8fc8f65ad05a50a71b33685b49cfd8d5170 Mon Sep 17 00:00:00 2001 From: Kangping Dong Date: Thu, 22 Feb 2024 10:59:36 +0800 Subject: [PATCH 19/19] [Thread] add Thread aconfig_declaration to java_sdk_library This commit also moves Thread flags to Connectivity/common to ease maintenance. Ignore-AOSP-first: cherry pick of aosp/2971692 Test: m framework-connectivity-t Bug: 317290555 Change-Id: I50f3d3b8205a5a9ee8154a649318a2c175edbb71 --- common/FlaggedApi.bp | 8 +++++++ common/OWNERS | 1 + .../thread_flags.aconfig | 0 framework-t/Android.bp | 1 + thread/flags/Android.bp | 23 ------------------- 5 files changed, 10 insertions(+), 23 deletions(-) create mode 100644 common/OWNERS rename thread/flags/thread_base.aconfig => common/thread_flags.aconfig (100%) delete mode 100644 thread/flags/Android.bp diff --git a/common/FlaggedApi.bp b/common/FlaggedApi.bp index 449d7ae77e..56625c5185 100644 --- a/common/FlaggedApi.bp +++ b/common/FlaggedApi.bp @@ -22,6 +22,14 @@ aconfig_declarations { visibility: ["//packages/modules/Connectivity:__subpackages__"], } +aconfig_declarations { + name: "com.android.net.thread.flags-aconfig", + package: "com.android.net.thread.flags", + container: "system", + srcs: ["thread_flags.aconfig"], + visibility: ["//packages/modules/Connectivity:__subpackages__"], +} + aconfig_declarations { name: "nearby_flags", package: "com.android.nearby.flags", diff --git a/common/OWNERS b/common/OWNERS new file mode 100644 index 0000000000..e7f5d11f73 --- /dev/null +++ b/common/OWNERS @@ -0,0 +1 @@ +per-file thread_flags.aconfig = file:platform/packages/modules/Connectivity:main:/thread/OWNERS diff --git a/thread/flags/thread_base.aconfig b/common/thread_flags.aconfig similarity index 100% rename from thread/flags/thread_base.aconfig rename to common/thread_flags.aconfig diff --git a/framework-t/Android.bp b/framework-t/Android.bp index e40b55cf09..468cee4613 100644 --- a/framework-t/Android.bp +++ b/framework-t/Android.bp @@ -197,6 +197,7 @@ java_sdk_library { ], aconfig_declarations: [ "com.android.net.flags-aconfig", + "com.android.net.thread.flags-aconfig", "nearby_flags", ], } diff --git a/thread/flags/Android.bp b/thread/flags/Android.bp deleted file mode 100644 index 15f58a9a03..0000000000 --- a/thread/flags/Android.bp +++ /dev/null @@ -1,23 +0,0 @@ -// -// Copyright (C) 2024 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -aconfig_declarations { - name: "com.android.net.thread.flags-aconfig", - package: "com.android.net.thread.flags", - container: "system", - srcs: ["thread_base.aconfig"], - visibility: ["//packages/modules/Connectivity:__subpackages__"], -}