From fa5cc51c8d27706c1bf025d01a9939acc632321f Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 17 Jul 2020 11:45:09 -0700 Subject: Resume-on-Reboot: remove special string User feedback shows that this string causes confusion that the update is going to start immediately. Bug: 161179448 Test: Fake OTA test Change-Id: I9590ebf76c81ef104f490ba31ada7c482cd70d56 (cherry picked from commit 3750b50e76e484e956e1d721a4e09ea1b0f94480) --- packages/SystemUI/res-keyguard/values-af/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-am/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-ar/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-as/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-az/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-be/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-bg/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-bn/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-bs/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-ca/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-cs/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-da/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-de/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-el/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-en-rAU/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-en-rCA/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-en-rGB/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-en-rIN/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-en-rXC/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-es-rUS/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-es/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-et/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-eu/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-fa/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-fi/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-fr/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-gl/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-gu/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-hi/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-hr/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-hu/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-hy/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-in/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-is/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-it/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-iw/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-ja/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-ka/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-kk/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-km/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-kn/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-ko/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-ky/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-lo/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-lt/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-lv/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-mk/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-ml/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-mn/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-mr/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-ms/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-my/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-nb/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-ne/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-nl/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-or/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-pa/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-pl/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-pt/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-ro/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-ru/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-si/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-sk/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-sl/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-sq/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-sr/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-sv/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-sw/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-ta/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-te/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-th/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-tl/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-tr/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-uk/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-ur/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-uz/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-vi/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml | 3 --- packages/SystemUI/res-keyguard/values-zu/strings.xml | 3 --- packages/SystemUI/res-keyguard/values/strings.xml | 9 --------- .../SystemUI/src/com/android/keyguard/KeyguardPasswordView.java | 2 +- .../SystemUI/src/com/android/keyguard/KeyguardPatternView.java | 3 +-- .../src/com/android/keyguard/KeyguardPinBasedInputView.java | 2 +- 89 files changed, 3 insertions(+), 268 deletions(-) diff --git a/packages/SystemUI/res-keyguard/values-af/strings.xml b/packages/SystemUI/res-keyguard/values-af/strings.xml index 8a1f6de432f8..92dd9fd96111 100644 --- a/packages/SystemUI/res-keyguard/values-af/strings.xml +++ b/packages/SystemUI/res-keyguard/values-af/strings.xml @@ -101,9 +101,6 @@ "Geen diens nie." "Wissel invoermetode" "Vliegtuigmodus" - "PIN word vereis om vir opdatering voor te berei" - "Patroon word vereis om vir opdatering voor te berei" - "Wagwoord word vereis om vir opdatering voor te berei" "Patroon word vereis nadat toestel herbegin het" "PIN word vereis nadat toestel herbegin het" "Wagwoord word vereis nadat toestel herbegin het" diff --git a/packages/SystemUI/res-keyguard/values-am/strings.xml b/packages/SystemUI/res-keyguard/values-am/strings.xml index 0a4aee53b7be..f94c20f9ad01 100644 --- a/packages/SystemUI/res-keyguard/values-am/strings.xml +++ b/packages/SystemUI/res-keyguard/values-am/strings.xml @@ -101,9 +101,6 @@ "ከአገልግሎት መስጫ ክልል ውጪ።" "የግቤት ስልት ቀይር" "የአውሮፕላን ሁነታ" - "ለዝማኔ ለማዘጋጀት ፒን ያስፈልጋል" - "ለዝማኔ ለማዘጋጀት ሥርዓተ ጥለት ያስፈልጋል" - "ለዝማኔ ለማዘጋጀት የይለፍ ቃል ያስፈልጋል" "መሣሪያ ዳግም ከጀመረ በኋላ ሥርዓተ ጥለት ያስፈልጋል" "መሣሪያ ዳግም ከተነሳ በኋላ ፒን ያስፈልጋል" "መሣሪያ ዳግም ከጀመረ በኋላ የይለፍ ቃል ያስፈልጋል" diff --git a/packages/SystemUI/res-keyguard/values-ar/strings.xml b/packages/SystemUI/res-keyguard/values-ar/strings.xml index 491dc39aa08d..6d86a78360d8 100644 --- a/packages/SystemUI/res-keyguard/values-ar/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ar/strings.xml @@ -113,9 +113,6 @@ "لا تتوفر خدمة." "تبديل أسلوب الإدخال" "وضع الطائرة" - "يجب إدخال رقم التعريف الشخصي للتحضير للتحديث." - "يجب رسم النقش للتحضير للتحديث." - "يجب إدخال كلمة المرور للتحضير للتحديث." "يجب رسم النقش بعد إعادة تشغيل الجهاز" "يجب إدخال رقم التعريف الشخصي بعد إعادة تشغيل الجهاز" "يجب إدخال كلمة المرور بعد إعادة تشغيل الجهاز" diff --git a/packages/SystemUI/res-keyguard/values-as/strings.xml b/packages/SystemUI/res-keyguard/values-as/strings.xml index 4367efb8c679..3b51e480b7dd 100644 --- a/packages/SystemUI/res-keyguard/values-as/strings.xml +++ b/packages/SystemUI/res-keyguard/values-as/strings.xml @@ -101,9 +101,6 @@ "কোনো সেৱা নাই।" "ইনপুট পদ্ধতি সলনি কৰক" "এয়াৰপ্লেন ম\'ড" - "আপডে\'টৰ বাবে সাজু হ\'বলৈ পিনৰ আৱশ্যক" - "আপডে\'টৰ বাবে সাজু হ\'বলৈ আর্হিৰ আৱশ্যক" - "আপডে\'টৰ বাবে সাজু হ\'বলৈ পাছৱৰ্ডৰ আৱশ্যক" "ডিভাইচ ৰিষ্টাৰ্ট হোৱাৰ পিছত আৰ্হি দিয়াটো বাধ্যতামূলক" "ডিভাইচ ৰিষ্টাৰ্ট হোৱাৰ পিছত পিন দিয়াটো বাধ্যতামূলক" "ডিভাইচ ৰিষ্টাৰ্ট হোৱাৰ পিছত পাছৱৰ্ড দিয়াটো বাধ্যতামূলক" diff --git a/packages/SystemUI/res-keyguard/values-az/strings.xml b/packages/SystemUI/res-keyguard/values-az/strings.xml index d89bf6a8c0ae..ea07c3db4354 100644 --- a/packages/SystemUI/res-keyguard/values-az/strings.xml +++ b/packages/SystemUI/res-keyguard/values-az/strings.xml @@ -101,9 +101,6 @@ "Xidmət yoxdur." "Daxiletmə metoduna keçin" "Təyyarə rejimi" - "Güncəlləməyə hazırlıq üçün PIN kod tələb olunur" - "Güncəlləməyə hazırlıq üçün model tələb olunur" - "Güncəlləməyə hazırlıq üçün parol tələb olunur" "Cihaz yenidən başladıqdan sonra model tələb olunur" "Cihaz yeniden başladıqdan sonra PIN tələb olunur" "Cihaz yeniden başladıqdan sonra parol tələb olunur" diff --git a/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml b/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml index 656e32301153..e206958d1e95 100644 --- a/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml @@ -104,9 +104,6 @@ "Mreža nije dostupna." "Promeni metod unosa" "Režim rada u avionu" - "PIN je obavezan radi pripreme za ažuriranje" - "Šablon je obavezan radi pripreme za ažuriranje" - "Lozinka je obavezna radi pripreme za ažuriranje" "Treba da unesete šablon kada se uređaj ponovo pokrene" "Treba da unesete PIN kada se uređaj ponovo pokrene" "Treba da unesete lozinku kada se uređaj ponovo pokrene" diff --git a/packages/SystemUI/res-keyguard/values-be/strings.xml b/packages/SystemUI/res-keyguard/values-be/strings.xml index 07b6f358dcfc..569e705fbcc2 100644 --- a/packages/SystemUI/res-keyguard/values-be/strings.xml +++ b/packages/SystemUI/res-keyguard/values-be/strings.xml @@ -107,9 +107,6 @@ "Не абслугоўваецца." "Пераключэнне рэжыму ўводу" "Рэжым палёту" - "Для падрыхтоўкі да абнаўлення неабходна ўвесці PIN-код" - "Для падрыхтоўкі да абнаўлення неабходна ўвесці ўзор разблакіроўкі" - "Для падрыхтоўкі да абнаўлення неабходна ўвесці пароль" "Пасля перазапуску прылады патрабуецца ўзор" "Пасля перазапуску прылады патрабуецца PIN-код" "Пасля перазапуску прылады патрабуецца пароль" diff --git a/packages/SystemUI/res-keyguard/values-bg/strings.xml b/packages/SystemUI/res-keyguard/values-bg/strings.xml index a8c64f5d9551..d015be320e20 100644 --- a/packages/SystemUI/res-keyguard/values-bg/strings.xml +++ b/packages/SystemUI/res-keyguard/values-bg/strings.xml @@ -101,9 +101,6 @@ "Няма покритие." "Превключване на метода на въвеждане" "Самолетен режим" - "За подготовката за актуализация се изисква ПИН код" - "За подготовката за актуализация се изисква фигура" - "За подготовката за актуализация се изисква парола" "След рестартиране на устройството се изисква фигура" "След рестартиране на устройството се изисква ПИН код" "След рестартиране на устройството се изисква парола" diff --git a/packages/SystemUI/res-keyguard/values-bn/strings.xml b/packages/SystemUI/res-keyguard/values-bn/strings.xml index 479e83ab3954..8eae6e6e2e18 100644 --- a/packages/SystemUI/res-keyguard/values-bn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-bn/strings.xml @@ -101,9 +101,6 @@ "কোনো পরিষেবা নেই।" "ইনপুট পদ্ধতি পরিবর্তন করুন" "বিমান মোড" - "আপডেট প্রস্তুত করতে পিন দরকার" - "আপডেট প্রস্তুত করতে প্যাটার্ন দরকার" - "আপডেট প্রস্তুত করতে পাসওয়ার্ড দরকার" "ডিভাইসটি পুনরায় চালু হওয়ার পর প্যাটার্নের প্রয়োজন হবে" "ডিভাইসটি পুনরায় চালু হওয়ার পর পিন প্রয়োজন হবে" "ডিভাইসটি পুনরায় চালু হওয়ার পর পাসওয়ার্ডের প্রয়োজন হবে" diff --git a/packages/SystemUI/res-keyguard/values-bs/strings.xml b/packages/SystemUI/res-keyguard/values-bs/strings.xml index ada4c134fce7..286b08be1c5e 100644 --- a/packages/SystemUI/res-keyguard/values-bs/strings.xml +++ b/packages/SystemUI/res-keyguard/values-bs/strings.xml @@ -104,9 +104,6 @@ "Nema mreže." "Promjena načina unosa" "Način rada u avionu" - "Za pripremu ažuriranja potreban je PIN" - "Za pripremu ažuriranja potreban je uzorak" - "Za pripremu ažuriranja potrebna je lozinka" "Potreban je uzorak nakon što se uređaj ponovo pokrene" "Potreban je PIN nakon što se uređaj ponovo pokrene" "Potrebna je lozinka nakon što se uređaj ponovo pokrene" diff --git a/packages/SystemUI/res-keyguard/values-ca/strings.xml b/packages/SystemUI/res-keyguard/values-ca/strings.xml index 6f5b6829c3e0..cb7fa37b281d 100644 --- a/packages/SystemUI/res-keyguard/values-ca/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ca/strings.xml @@ -101,9 +101,6 @@ "Sense servei" "Canvia el mètode d\'introducció" "Mode d\'avió" - "Cal introduir el PIN per preparar l\'actualització" - "Cal introduir el patró per preparar l\'actualització" - "Cal introduir la contrasenya per preparar l\'actualització" "Cal introduir el patró quan es reinicia el dispositiu" "Cal introduir el PIN quan es reinicia el dispositiu" "Cal introduir la contrasenya quan es reinicia el dispositiu" diff --git a/packages/SystemUI/res-keyguard/values-cs/strings.xml b/packages/SystemUI/res-keyguard/values-cs/strings.xml index a2f79adff1db..4f0c0ffa4962 100644 --- a/packages/SystemUI/res-keyguard/values-cs/strings.xml +++ b/packages/SystemUI/res-keyguard/values-cs/strings.xml @@ -107,9 +107,6 @@ "Žádný signál" "Přepnout metodu zadávání" "Režim Letadlo" - "Příprava na aktualizaci vyžaduje PIN" - "Příprava na aktualizaci vyžaduje gesto" - "Příprava na aktualizaci vyžaduje heslo" "Po restartování zařízení je vyžadováno gesto" "Po restartování zařízení je vyžadován kód PIN" "Po restartování zařízení je vyžadováno heslo" diff --git a/packages/SystemUI/res-keyguard/values-da/strings.xml b/packages/SystemUI/res-keyguard/values-da/strings.xml index ef06269b5630..e486fc625699 100644 --- a/packages/SystemUI/res-keyguard/values-da/strings.xml +++ b/packages/SystemUI/res-keyguard/values-da/strings.xml @@ -101,9 +101,6 @@ "Ingen dækning." "Skift indtastningsmetode" "Flytilstand" - "Du skal angive din pinkode for at forberede opdateringen" - "Du skal angive dit mønster for at forberede opdateringen" - "Du skal angive din adgangskode for at forberede opdateringen" "Du skal angive et mønster, når du har genstartet enheden" "Der skal angives en pinkode efter genstart af enheden" "Der skal angives en adgangskode efter genstart af enheden" diff --git a/packages/SystemUI/res-keyguard/values-de/strings.xml b/packages/SystemUI/res-keyguard/values-de/strings.xml index fdfce1ffb338..06d012f4e84d 100644 --- a/packages/SystemUI/res-keyguard/values-de/strings.xml +++ b/packages/SystemUI/res-keyguard/values-de/strings.xml @@ -101,9 +101,6 @@ "Dienst nicht verfügbar" "Eingabemethode wechseln" "Flugmodus" - "Zur Vorbereitung auf das Update ist eine PIN erforderlich" - "Zur Vorbereitung auf das Update ist ein Muster erforderlich" - "Zur Vorbereitung auf das Update ist ein Passwort erforderlich" "Nach dem Neustart des Geräts ist die Eingabe des Musters erforderlich" "Nach dem Neustart des Geräts ist die Eingabe der PIN erforderlich" "Nach dem Neustart des Geräts ist die Eingabe des Passworts erforderlich" diff --git a/packages/SystemUI/res-keyguard/values-el/strings.xml b/packages/SystemUI/res-keyguard/values-el/strings.xml index 8e4578f8445c..176428421476 100644 --- a/packages/SystemUI/res-keyguard/values-el/strings.xml +++ b/packages/SystemUI/res-keyguard/values-el/strings.xml @@ -101,9 +101,6 @@ "Καμία υπηρεσία." "Εναλλαγή μεθόδου εισαγωγής" "Λειτουργία πτήσης" - "Απαιτείται PIN για την προετοιμασία για ενημέρωση" - "Απαιτείται μοτίβο για την προετοιμασία για ενημέρωση" - "Απαιτείται κωδικός πρόσβασης για την προετοιμασία για ενημέρωση" "Απαιτείται μοτίβο μετά από την επανεκκίνηση της συσκευής" "Απαιτείται PIN μετά από την επανεκκίνηση της συσκευής" "Απαιτείται κωδικός πρόσβασης μετά από την επανεκκίνηση της συσκευής" diff --git a/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml b/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml index 21cfe48689ae..92a15949a8ab 100644 --- a/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml @@ -101,9 +101,6 @@ "No service" "Switch input method" "Aeroplane mode" - "PIN required to prepare for update" - "Pattern required to prepare for update" - "Password required to prepare for update" "Pattern required after device restarts" "PIN required after device restarts" "Password required after device restarts" diff --git a/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml b/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml index 921ba6b59af9..719f1a18a744 100644 --- a/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml @@ -101,9 +101,6 @@ "No service" "Switch input method" "Airplane mode" - "PIN required to prepare for update" - "Pattern required to prepare for update" - "Password required to prepare for update" "Pattern required after device restarts" "PIN required after device restarts" "Password required after device restarts" diff --git a/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml b/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml index 21cfe48689ae..92a15949a8ab 100644 --- a/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml @@ -101,9 +101,6 @@ "No service" "Switch input method" "Aeroplane mode" - "PIN required to prepare for update" - "Pattern required to prepare for update" - "Password required to prepare for update" "Pattern required after device restarts" "PIN required after device restarts" "Password required after device restarts" diff --git a/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml b/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml index 21cfe48689ae..92a15949a8ab 100644 --- a/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml @@ -101,9 +101,6 @@ "No service" "Switch input method" "Aeroplane mode" - "PIN required to prepare for update" - "Pattern required to prepare for update" - "Password required to prepare for update" "Pattern required after device restarts" "PIN required after device restarts" "Password required after device restarts" diff --git a/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml b/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml index fc59d0dfcdc5..975b1f644ef8 100644 --- a/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml @@ -101,9 +101,6 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎No service.‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎Switch input method‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎Airplane mode‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎‏‎‎‏‏‏‎PIN required to prepare for update‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎Pattern required to prepare for update‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎Password required to prepare for update‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‎‎‎‏‎‎Pattern required after device restarts‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎PIN required after device restarts‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎Password required after device restarts‎‏‎‎‏‎" diff --git a/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml b/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml index ab0c8f351562..25ab6159998e 100644 --- a/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml +++ b/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml @@ -101,9 +101,6 @@ "Sin servicio" "Cambiar método de entrada" "Modo de avión" - "Se requiere el PIN para actualizar el sistema" - "Se requiere el patrón para actualizar el sistema" - "Se requiere la contraseña para actualizar el sistema" "Se requiere el patrón después de reiniciar el dispositivo" "Se requiere el PIN después de reiniciar el dispositivo" "Se requiere la contraseña después de reiniciar el dispositivo" diff --git a/packages/SystemUI/res-keyguard/values-es/strings.xml b/packages/SystemUI/res-keyguard/values-es/strings.xml index 38451c7cfba5..0754681215cc 100644 --- a/packages/SystemUI/res-keyguard/values-es/strings.xml +++ b/packages/SystemUI/res-keyguard/values-es/strings.xml @@ -101,9 +101,6 @@ "Sin servicio" "Cambiar método de introducción" "Modo avión" - "Debes introducir el PIN para prepararte para la actualización" - "Debes dibujar el patrón para prepararte para la actualización" - "Debes introducir la contraseña para prepararte para la actualización" "Debes introducir el patrón después de reiniciar el dispositivo" "Debes introducir el PIN después de reiniciar el dispositivo" "Debes introducir la contraseña después de reiniciar el dispositivo" diff --git a/packages/SystemUI/res-keyguard/values-et/strings.xml b/packages/SystemUI/res-keyguard/values-et/strings.xml index f8ad18bba2f7..331a95c73c5e 100644 --- a/packages/SystemUI/res-keyguard/values-et/strings.xml +++ b/packages/SystemUI/res-keyguard/values-et/strings.xml @@ -101,9 +101,6 @@ "Teenus puudub." "Vaheta sisestusmeetodit" "Lennukirežiim" - "Värskendamiseks ettevalmistuste tegemiseks tuleb sisestada PIN-kood" - "Värskendamiseks ettevalmistuste tegemiseks tuleb sisestada muster" - "Värskendamiseks ettevalmistuste tegemiseks tuleb sisestada parool" "Pärast seadme taaskäivitamist tuleb sisestada muster" "Pärast seadme taaskäivitamist tuleb sisestada PIN-kood" "Pärast seadme taaskäivitamist tuleb sisestada parool" diff --git a/packages/SystemUI/res-keyguard/values-eu/strings.xml b/packages/SystemUI/res-keyguard/values-eu/strings.xml index 8510bee0711b..3ff224b9e55a 100644 --- a/packages/SystemUI/res-keyguard/values-eu/strings.xml +++ b/packages/SystemUI/res-keyguard/values-eu/strings.xml @@ -101,9 +101,6 @@ "Ez dago konektatuta inongo saretara." "Aldatu idazketa-metodoa" "Hegaldi modua" - "PIN kodea behar da eguneratzea prestatzeko" - "Eredua behar da eguneratzea prestatzeko" - "Pasahitza behar da eguneratzea prestatzeko" "Eredua marraztu beharko duzu gailua berrabiarazten denean" "PIN kodea idatzi beharko duzu gailua berrabiarazten denean" "Pasahitza idatzi beharko duzu gailua berrabiarazten denean" diff --git a/packages/SystemUI/res-keyguard/values-fa/strings.xml b/packages/SystemUI/res-keyguard/values-fa/strings.xml index 43d32140b153..5e696369634e 100644 --- a/packages/SystemUI/res-keyguard/values-fa/strings.xml +++ b/packages/SystemUI/res-keyguard/values-fa/strings.xml @@ -101,9 +101,6 @@ "سرویسی وجود ندارد." "تغییر روش ورودی" "حالت هواپیما" - "آماده‌سازی برای به‌روزرسانی به پین نیاز دارد" - "آماده‌سازی برای به‌روزرسانی به الگو نیاز دارد" - "آماده‌سازی برای به‌روزرسانی به گذرواژه نیاز دارد" "بعد از بازنشانی دستگاه باید الگو وارد شود" "بعد از بازنشانی دستگاه باید پین وارد شود" "بعد از بازنشانی دستگاه باید گذرواژه وارد شود" diff --git a/packages/SystemUI/res-keyguard/values-fi/strings.xml b/packages/SystemUI/res-keyguard/values-fi/strings.xml index 7dc12c93e45e..54bc4d8cba58 100644 --- a/packages/SystemUI/res-keyguard/values-fi/strings.xml +++ b/packages/SystemUI/res-keyguard/values-fi/strings.xml @@ -101,9 +101,6 @@ "Ei yhteyttä" "Vaihda syöttötapaa." "Lentokonetila" - "Päivitykseen valmistautuminen edellyttää PIN-koodia" - "Päivitykseen valmistautuminen edellyttää kuviota" - "Päivitykseen valmistautuminen edellyttää salasanaa" "Kuvio vaaditaan laitteen uudelleenkäynnistyksen jälkeen." "PIN-koodi vaaditaan laitteen uudelleenkäynnistyksen jälkeen." "Salasana vaaditaan laitteen uudelleenkäynnistyksen jälkeen." diff --git a/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml b/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml index f093c1745e76..3e858c2ecf12 100644 --- a/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml @@ -101,9 +101,6 @@ "Aucun service" "Changer de méthode d\'entrée" "Mode Avion" - "Le NIP est nécessaire pour préparer la mise à jour" - "Le schéma est nécessaire pour préparer la mise à jour" - "Le mot de passe est nécessaire pour préparer la mise à jour" "Le schéma est exigé après le redémarrage de l\'appareil" "Le NIP est exigé après le redémarrage de l\'appareil" "Le mot de passe est exigé après le redémarrage de l\'appareil" diff --git a/packages/SystemUI/res-keyguard/values-fr/strings.xml b/packages/SystemUI/res-keyguard/values-fr/strings.xml index d6d5a32874c2..8551fab7281f 100644 --- a/packages/SystemUI/res-keyguard/values-fr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-fr/strings.xml @@ -101,9 +101,6 @@ "Aucun service." "Changer le mode de saisie" "Mode Avion" - "Veuillez saisir le code pour lancer la préparation de la mise à jour" - "Veuillez saisir le schéma pour lancer la préparation de la mise à jour" - "Veuillez saisir le mot de passe pour lancer la préparation de la mise à jour" "Veuillez dessiner le schéma après le redémarrage de l\'appareil" "Veuillez saisir le code après le redémarrage de l\'appareil" "Veuillez saisir le mot de passe après le redémarrage de l\'appareil" diff --git a/packages/SystemUI/res-keyguard/values-gl/strings.xml b/packages/SystemUI/res-keyguard/values-gl/strings.xml index f5d5bb4d13d4..46079810aee4 100644 --- a/packages/SystemUI/res-keyguard/values-gl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-gl/strings.xml @@ -101,9 +101,6 @@ "Non hai servizo." "Cambia o método de introdución" "Modo avión" - "Necesítase o PIN para preparar o dispositivo co fin de actualizalo" - "Necesítase o padrón para preparar o dispositivo co fin de actualizalo" - "Necesítase o contrasinal para preparar o dispositivo co fin de actualizalo" "É necesario o padrón despois do reinicio do dispositivo" "É necesario o PIN despois do reinicio do dispositivo" "É necesario o contrasinal despois do reinicio do dispositivo" diff --git a/packages/SystemUI/res-keyguard/values-gu/strings.xml b/packages/SystemUI/res-keyguard/values-gu/strings.xml index 29e2fe040082..b02d3d97b39f 100644 --- a/packages/SystemUI/res-keyguard/values-gu/strings.xml +++ b/packages/SystemUI/res-keyguard/values-gu/strings.xml @@ -101,9 +101,6 @@ "કોઈ સેવા નથી." "ઇનપુટ પદ્ધતિ સ્વિચ કરો" "એરપ્લેન મોડ" - "અપડેટ માટે તૈયાર કરવા માટે પિન જરુરી છે" - "અપડેટ માટે તૈયાર કરવા માટે પૅટર્ન જરુરી છે" - "અપડેટ માટે તૈયાર કરવા માટે પાસવર્ડ જરુરી છે" "ઉપકરણનો પુનઃપ્રારંભ થાય તે પછી પૅટર્ન જરૂરી છે" "ઉપકરણનો પુનઃપ્રારંભ થાય તે પછી પિન જરૂરી છે" "ઉપકરણનો પુનઃપ્રારંભ થાય તે પછી પાસવર્ડ જરૂરી છે" diff --git a/packages/SystemUI/res-keyguard/values-hi/strings.xml b/packages/SystemUI/res-keyguard/values-hi/strings.xml index d26c79f9c420..f6b15de0e97e 100644 --- a/packages/SystemUI/res-keyguard/values-hi/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hi/strings.xml @@ -101,9 +101,6 @@ "कोई सेवा नहीं." "इनपुट का तरीका बदलें" "हवाई जहाज़ मोड" - "अपडेट के लिए पिन डालना ज़रूरी है" - "अपडेट के लिए पैटर्न डालना ज़रूरी है" - "अपडेट के लिए पासवर्ड डालना ज़रूरी है" "डिवाइस फिर से चालू होने के बाद पैटर्न ज़रूरी है" "डिवाइस फिर से चालू होने के बाद पिन ज़रूरी है" "डिवाइस फिर से चालू होने के बाद पासवर्ड ज़रूरी है" diff --git a/packages/SystemUI/res-keyguard/values-hr/strings.xml b/packages/SystemUI/res-keyguard/values-hr/strings.xml index c8dd9b0a0932..49db3f88669a 100644 --- a/packages/SystemUI/res-keyguard/values-hr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hr/strings.xml @@ -104,9 +104,6 @@ "Nema usluge." "Promjena načina unosa" "Način rada u zrakoplovu" - "Za pripremu ažuriranja potreban je PIN" - "Za pripremu ažuriranja potreban je uzorak" - "Za pripremu ažuriranja potrebna je zaporka" "Nakon ponovnog pokretanja uređaja morate unijeti uzorak" "Nakon ponovnog pokretanja uređaja morate unijeti PIN" "Nakon ponovnog pokretanja uređaja morate unijeti zaporku" diff --git a/packages/SystemUI/res-keyguard/values-hu/strings.xml b/packages/SystemUI/res-keyguard/values-hu/strings.xml index f0023d20e6bd..c26998f01ff0 100644 --- a/packages/SystemUI/res-keyguard/values-hu/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hu/strings.xml @@ -101,9 +101,6 @@ "Nincs szolgáltatás." "Beviteli módszer váltása" "Repülős üzemmód" - "A frissítésre való felkészüléshez meg kell adni a PIN-kódot" - "A frissítésre való felkészüléshez meg kell adni a mintát" - "A frissítésre való felkészüléshez meg kell adni a jelszót" "Az eszköz újraindítását követően meg kell adni a mintát" "Az eszköz újraindítását követően meg kell adni a PIN-kódot" "Az eszköz újraindítását követően meg kell adni a jelszót" diff --git a/packages/SystemUI/res-keyguard/values-hy/strings.xml b/packages/SystemUI/res-keyguard/values-hy/strings.xml index 42247052014f..ad949d48fe0c 100644 --- a/packages/SystemUI/res-keyguard/values-hy/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hy/strings.xml @@ -101,9 +101,6 @@ "Ծառայությունն անհասանելի է։" "Փոխել ներածման եղանակը" "Ավիառեժիմ" - "Թարմացմանը պատրաստվելու համար անհրաժեշտ է մուտքագրել PIN-ը" - "Թարմացմանը պատրաստվելու համար անհրաժեշտ է մուտքագրել նախշը" - "Թարմացմանը պատրաստվելու համար անհրաժեշտ է մուտքագրել գաղտնաբառը" "Սարքը վերագործարկելուց հետո անհրաժեշտ է մուտքագրել նախշը" "Սարքը վերագործարկելուց հետո անհրաժեշտ է մուտքագրել PIN կոդը" "Սարքը վերագործարկելուց հետո անհրաժեշտ է մուտքագրել գաղտնաբառը" diff --git a/packages/SystemUI/res-keyguard/values-in/strings.xml b/packages/SystemUI/res-keyguard/values-in/strings.xml index d62795ba1b14..85b2a4726fa2 100644 --- a/packages/SystemUI/res-keyguard/values-in/strings.xml +++ b/packages/SystemUI/res-keyguard/values-in/strings.xml @@ -101,9 +101,6 @@ "Tidak ada layanan." "Beralih metode masukan" "Mode pesawat" - "PIN diwajibkan untuk menyiapkan update" - "Pola diwajibkan untuk menyiapkan update" - "Sandi diwajibkan untuk menyiapkan update" "Pola diperlukan setelah perangkat dimulai ulang" "PIN diperlukan setelah perangkat dimulai ulang" "Sandi diperlukan setelah perangkat dimulai ulang" diff --git a/packages/SystemUI/res-keyguard/values-is/strings.xml b/packages/SystemUI/res-keyguard/values-is/strings.xml index 5e3765571c02..e40cdca33034 100644 --- a/packages/SystemUI/res-keyguard/values-is/strings.xml +++ b/packages/SystemUI/res-keyguard/values-is/strings.xml @@ -101,9 +101,6 @@ "Ekkert símasamband." "Skipta um innsláttaraðferð" "Flugstilling" - "Slá þarf inn PIN-númer til að undirbúa uppfærsluna" - "Teikna þarf mynstur til að undirbúa uppfærsluna" - "Gefa þarf upp aðgangsorð til að undirbúa uppfærsluna" "Mynsturs er krafist þegar tækið er endurræst" "PIN-númers er krafist þegar tækið er endurræst" "Aðgangsorðs er krafist þegar tækið er endurræst" diff --git a/packages/SystemUI/res-keyguard/values-it/strings.xml b/packages/SystemUI/res-keyguard/values-it/strings.xml index fe460e38dc0b..e1c9ee8b7d34 100644 --- a/packages/SystemUI/res-keyguard/values-it/strings.xml +++ b/packages/SystemUI/res-keyguard/values-it/strings.xml @@ -101,9 +101,6 @@ "Nessun servizio." "Cambia metodo di immissione" "Modalità aereo" - "PIN obbligatorio per la preparazione all\'aggiornamento" - "Sequenza obbligatoria per la preparazione all\'aggiornamento" - "Password obbligatoria per la preparazione all\'aggiornamento" "Sequenza obbligatoria dopo il riavvio del dispositivo" "PIN obbligatorio dopo il riavvio del dispositivo" "Password obbligatoria dopo il riavvio del dispositivo" diff --git a/packages/SystemUI/res-keyguard/values-iw/strings.xml b/packages/SystemUI/res-keyguard/values-iw/strings.xml index 71f3048ba11c..e054f629836e 100644 --- a/packages/SystemUI/res-keyguard/values-iw/strings.xml +++ b/packages/SystemUI/res-keyguard/values-iw/strings.xml @@ -107,9 +107,6 @@ "אין שירות." "החלפת שיטת קלט" "מצב טיסה" - "נדרש קוד אימות להכנת העדכון" - "נדרש קו ביטול נעילה להכנת העדכון" - "נדרשת סיסמה להכנת העדכון" "יש להזין את קו ביטול הנעילה לאחר הפעלה מחדש של המכשיר" "יש להזין קוד גישה לאחר הפעלה מחדש של המכשיר" "יש להזין סיסמה לאחר הפעלה מחדש של המכשיר" diff --git a/packages/SystemUI/res-keyguard/values-ja/strings.xml b/packages/SystemUI/res-keyguard/values-ja/strings.xml index 23ff82c6f2a7..957d78a8b440 100644 --- a/packages/SystemUI/res-keyguard/values-ja/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ja/strings.xml @@ -101,9 +101,6 @@ "通信サービスはありません。" "入力方法の切り替え" "機内モード" - "更新の準備には PIN の入力が必要です" - "更新の準備にはパターンの入力が必要です" - "更新の準備にはパスワードが必要です" "デバイスの再起動後はパターンの入力が必要となります" "デバイスの再起動後は PIN の入力が必要となります" "デバイスの再起動後はパスワードの入力が必要となります" diff --git a/packages/SystemUI/res-keyguard/values-ka/strings.xml b/packages/SystemUI/res-keyguard/values-ka/strings.xml index 25b9b1b22c1c..d0d15fec7172 100644 --- a/packages/SystemUI/res-keyguard/values-ka/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ka/strings.xml @@ -101,9 +101,6 @@ "სერვისი არ არის." "შეყვანის მეთოდის გადართვა" "თვითმფრინავის რეჟიმი" - "განახლების მოსამზადებლად საჭიროა PIN-კოდი" - "განახლების მოსამზადებლად საჭიროა ნიმუში" - "განახლების მოსამზადებლად საჭიროა პაროლი" "მოწყობილობის გადატვირთვის შემდეგ საჭიროა ნიმუშის დახატვა" "მოწყობილობის გადატვირთვის შემდეგ საჭიროა PIN-კოდის შეყვანა" "მოწყობილობის გადატვირთვის შემდეგ საჭიროა პაროლის შეყვანა" diff --git a/packages/SystemUI/res-keyguard/values-kk/strings.xml b/packages/SystemUI/res-keyguard/values-kk/strings.xml index 456088181d7f..62afd1e45df8 100644 --- a/packages/SystemUI/res-keyguard/values-kk/strings.xml +++ b/packages/SystemUI/res-keyguard/values-kk/strings.xml @@ -101,9 +101,6 @@ "Қызмет көрсетілмейді." "Енгізу әдісін ауыстыру" "Ұшақ режимі" - "Жаңа нұсқа орнатуға дайындау үшін PIN кодын енгізу қажет." - "Жаңа нұсқа орнатуға дайындау үшін өрнек енгізу қажет." - "Жаңа нұсқа орнатуға дайындау үшін құпия сөз енгізу қажет." "Құрылғы қайта іске қосылғаннан кейін, өрнекті енгізу қажет" "Құрылғы қайта іске қосылғаннан кейін, PIN кодын енгізу қажет" "Құрылғы қайта іске қосылғаннан кейін, құпия сөзді енгізу қажет" diff --git a/packages/SystemUI/res-keyguard/values-km/strings.xml b/packages/SystemUI/res-keyguard/values-km/strings.xml index e5ea9ea105dd..24b5c23a6732 100644 --- a/packages/SystemUI/res-keyguard/values-km/strings.xml +++ b/packages/SystemUI/res-keyguard/values-km/strings.xml @@ -101,9 +101,6 @@ "គ្មាន​សេវា​ទេ។" "ប្ដូរ​វិធី​បញ្ចូល" "មុខងារ​ពេល​ជិះ​យន្តហោះ" - "តម្រូវ​ឱ្យ​មាន​កូដ PIN ដើម្បី​រៀបចំ​ធ្វើបច្ចុប្បន្នភាព" - "តម្រូវ​ឱ្យ​មាន​លំនាំ ដើម្បី​រៀបចំ​ធ្វើបច្ចុប្បន្នភាព" - "តម្រូវ​ឱ្យ​មាន​ពាក្យ​សម្ងាត់ ដើម្បី​រៀបចំ​ធ្វើបច្ចុប្បន្នភាព" "តម្រូវឲ្យប្រើលំនាំ បន្ទាប់ពីឧបករណ៍ចាប់ផ្តើមឡើងវិញ" "តម្រូវឲ្យបញ្ចូលកូដ PIN បន្ទាប់ពីឧបករណ៍ចាប់ផ្តើមឡើងវិញ" "តម្រូវឲ្យបញ្ចូលពាក្យសម្ងាត់ បន្ទាប់ពីឧបករណ៍ចាប់ផ្តើមឡើងវិញ" diff --git a/packages/SystemUI/res-keyguard/values-kn/strings.xml b/packages/SystemUI/res-keyguard/values-kn/strings.xml index 8173ca047fe3..785ca4338326 100644 --- a/packages/SystemUI/res-keyguard/values-kn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-kn/strings.xml @@ -101,9 +101,6 @@ "ಸೇವೆ ಇಲ್ಲ." "ಇನ್‌ಪುಟ್‌‌ ವಿಧಾನ ಬದಲಿಸಿ" "ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್" - "ಅಪ್‌ಡೇಟ್‌ಗಾಗಿ ಸಿದ್ಧಗೊಳಿಸಲು, ಪಿನ್‌‌ ಅಗತ್ಯವಿದೆ" - "ಅಪ್‌ಡೇಟ್‌ಗಾಗಿ ಸಿದ್ಧಗೊಳಿಸಲು, ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿದೆ" - "ಅಪ್‌ಡೇಟ್‌ಗಾಗಿ ಸಿದ್ಧಗೊಳಿಸಲು, ಪಾಸ್‌ವರ್ಡ್ ಅಗತ್ಯವಿದೆ" "ಸಾಧನ ಮರುಪ್ರಾರಂಭಗೊಂಡ ನಂತರ ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿರುತ್ತದೆ" "ಸಾಧನ ಮರುಪ್ರಾರಂಭಗೊಂಡ ನಂತರ ಪಿನ್ ಅಗತ್ಯವಿರುತ್ತದೆ" "ಸಾಧನ ಮರುಪ್ರಾರಂಭಗೊಂಡ ನಂತರ ಪಾಸ್‌ವರ್ಡ್ ಅಗತ್ಯವಿರುತ್ತದೆ" diff --git a/packages/SystemUI/res-keyguard/values-ko/strings.xml b/packages/SystemUI/res-keyguard/values-ko/strings.xml index 606bb5047245..848490ebb9b8 100644 --- a/packages/SystemUI/res-keyguard/values-ko/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ko/strings.xml @@ -101,9 +101,6 @@ "서비스 불가" "입력 방법 전환" "비행기 모드" - "업데이트를 준비하려면 PIN이 필요합니다." - "업데이트를 준비하려면 패턴이 필요합니다." - "업데이트를 준비하려면 비밀번호가 필요합니다." "기기가 다시 시작되면 패턴이 필요합니다." "기기가 다시 시작되면 PIN이 필요합니다." "기기가 다시 시작되면 비밀번호가 필요합니다." diff --git a/packages/SystemUI/res-keyguard/values-ky/strings.xml b/packages/SystemUI/res-keyguard/values-ky/strings.xml index 72f95dbfa59f..d868788a3eca 100644 --- a/packages/SystemUI/res-keyguard/values-ky/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ky/strings.xml @@ -101,9 +101,6 @@ "Интернет жок." "Киргизүү ыкмасын өзгөртүү" "Учак режими" - "Жаңыртууга даярдоо үчүн PIN код талап кылынат" - "Жаңыртууга даярдоо үчүн графикалык ачкыч талап кылынат" - "Жаңыртууга даярдоо үчүн сырсөз талап кылынат" "Түзмөк кайра күйгүзүлгөндөн кийин графикалык ачкычты тартуу талап кылынат" "Түзмөк кайра күйгүзүлгөндөн кийин PIN-кодду киргизүү талап кылынат" "Түзмөк кайра күйгүзүлгөндөн кийин сырсөздү киргизүү талап кылынат" diff --git a/packages/SystemUI/res-keyguard/values-lo/strings.xml b/packages/SystemUI/res-keyguard/values-lo/strings.xml index 25e36c1b3115..ebaffb13d5b4 100644 --- a/packages/SystemUI/res-keyguard/values-lo/strings.xml +++ b/packages/SystemUI/res-keyguard/values-lo/strings.xml @@ -101,9 +101,6 @@ "ບໍ່ມີບໍລິການ" "ສະລັບຮູບແບບການປ້ອນຂໍ້ມູນ" "ໂໝດໃນຍົນ" - "ຕ້ອງໃຊ້ PIN ເພື່ອກະກຽມອັບເດດ" - "ຕ້ອງໃຊ້ຮູບແບບເພື່ອກະກຽມອັບເດດ" - "ຕ້ອງໃຊ້ລະຫັດຜ່ານເພື່ອກະກຽມອັບເດດ" "ຈຳເປັນຕ້ອງມີແບບຮູບປົດລັອກຫຼັງຈາກອຸປະກອນເລີ່ມລະບົບໃໝ່" "ຈຳເປັນຕ້ອງມີ PIN ຫຼັງຈາກອຸປະກອນເລີ່ມລະບົບໃໝ່" "ຈຳເປັນຕ້ອງມີລະຫັດຜ່ານຫຼັງຈາກອຸປະກອນເລີ່ມລະບົບໃໝ່" diff --git a/packages/SystemUI/res-keyguard/values-lt/strings.xml b/packages/SystemUI/res-keyguard/values-lt/strings.xml index 158efe2feabb..4d598f6bfb6d 100644 --- a/packages/SystemUI/res-keyguard/values-lt/strings.xml +++ b/packages/SystemUI/res-keyguard/values-lt/strings.xml @@ -107,9 +107,6 @@ "Nėra paslaugos." "Perjungti įvesties metodą" "Lėktuvo režimas" - "Kad būtų pasiruošta atnaujinti, reikia įvesti PIN kodą" - "Kad būtų pasiruošta atnaujinti, reikia įvesti atrakinimo piešinį" - "Kad būtų pasiruošta atnaujinti, reikia įvesti slaptažodį" "Iš naujo paleidus įrenginį būtinas atrakinimo piešinys" "Iš naujo paleidus įrenginį būtinas PIN kodas" "Iš naujo paleidus įrenginį būtinas slaptažodis" diff --git a/packages/SystemUI/res-keyguard/values-lv/strings.xml b/packages/SystemUI/res-keyguard/values-lv/strings.xml index c4a4e7f45b38..fad67d536e58 100644 --- a/packages/SystemUI/res-keyguard/values-lv/strings.xml +++ b/packages/SystemUI/res-keyguard/values-lv/strings.xml @@ -104,9 +104,6 @@ "Nav pakalpojuma." "Pārslēgt ievades metodi" "Lidojuma režīms" - "Lai sagatavotos atjauninājumam, nepieciešams PIN." - "Lai sagatavotos atjauninājumam, nepieciešama kombinācija." - "Lai sagatavotos atjauninājumam, nepieciešama parole." "Pēc ierīces restartēšanas ir jāievada atbloķēšanas kombinācija." "Pēc ierīces restartēšanas ir jāievada PIN kods." "Pēc ierīces restartēšanas ir jāievada parole." diff --git a/packages/SystemUI/res-keyguard/values-mk/strings.xml b/packages/SystemUI/res-keyguard/values-mk/strings.xml index de4a83b97021..1397f467e116 100644 --- a/packages/SystemUI/res-keyguard/values-mk/strings.xml +++ b/packages/SystemUI/res-keyguard/values-mk/strings.xml @@ -101,9 +101,6 @@ "Нема услуга." "Префрли метод за внесување" "Авионски режим" - "Потребен е PIN за да се подготви за ажурирање" - "Потребна е шема за да се подготви за ажурирање" - "Потребна е лозинка за да се подготви за ажурирање" "Потребна е шема по рестартирање на уредот" "Потребен е PIN-код по рестартирање на уредот" "Потребна е лозинка по рестартирање на уредот" diff --git a/packages/SystemUI/res-keyguard/values-ml/strings.xml b/packages/SystemUI/res-keyguard/values-ml/strings.xml index da26ba788932..f82f822ca26c 100644 --- a/packages/SystemUI/res-keyguard/values-ml/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ml/strings.xml @@ -101,9 +101,6 @@ "സേവനമില്ല" "ഇൻപുട്ട് രീതി മാറുക" "ഫ്ലൈറ്റ് മോഡ്" - "അപ്‌ഡേറ്റിനായി തയ്യാറെടുക്കാൻ പിൻ ആവശ്യമാണ്" - "അപ്‌ഡേറ്റിനായി തയ്യാറെടുക്കാൻ പാറ്റേൺ ആവശ്യമാണ്" - "അപ്‌ഡേറ്റിനായി തയ്യാറെടുക്കാൻ പാസ്‌വേഡ് ആവശ്യമാണ്" "ഉപകരണം റീസ്റ്റാർട്ടായശേഷം ‌പാറ്റേൺ വരയ്‌ക്കേണ്ടതുണ്ട്" "ഉപകരണം റീസ്റ്റാർട്ടായശേഷം ‌പിൻ നൽകേണ്ടതുണ്ട്" "ഉപകരണം റീസ്റ്റാർട്ടായശേഷം ‌പാസ്‌വേഡ് നൽകേണ്ടതുണ്ട്" diff --git a/packages/SystemUI/res-keyguard/values-mn/strings.xml b/packages/SystemUI/res-keyguard/values-mn/strings.xml index fb032f15df7f..462017af1922 100644 --- a/packages/SystemUI/res-keyguard/values-mn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-mn/strings.xml @@ -101,9 +101,6 @@ "Үйлчилгээ алга." "Оруулах аргыг сэлгэх" "Нислэгийн горим" - "Шинэчлэхэд бэлтгэхийн тулд ПИН шаардлагатай" - "Шинэчлэхэд бэлтгэхийн тулд хээ шаардлагатай" - "Шинэчлэхэд бэлтгэхийн тулд нууц үг шаардлагатай" "Төхөөрөмжийг дахин эхлүүлсний дараа загвар оруулах шаардлагатай" "Төхөөрөмжийг дахин эхлүүлсний дараа ПИН оруулах шаардлагатай" "Төхөөрөмжийг дахин эхлүүлсний дараа нууц үг оруулах шаардлагатай" diff --git a/packages/SystemUI/res-keyguard/values-mr/strings.xml b/packages/SystemUI/res-keyguard/values-mr/strings.xml index e79e5c5d9234..0166791dc3ba 100644 --- a/packages/SystemUI/res-keyguard/values-mr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-mr/strings.xml @@ -101,9 +101,6 @@ "सेवा नाही." "इनपुट पद्धत स्विच करा" "विमान मोड" - "अपडेटसाठी तयार करण्याकरिता पिन आवश्यक आहे" - "अपडेटसाठी तयार करण्याकरिता पॅटर्न आवश्यक आहे" - "अपडेटसाठी तयार करण्याकरिता पासवर्ड आवश्यक आहे" "डिव्हाइस रीस्टार्ट झाल्यावर पॅटर्न आवश्यक आहे" "डिव्हाइस रीस्टार्ट झाल्यावर पिन आवश्यक आहे" "डिव्हाइस रीस्टार्ट झाल्यावर पासवर्ड आवश्यक आहे" diff --git a/packages/SystemUI/res-keyguard/values-ms/strings.xml b/packages/SystemUI/res-keyguard/values-ms/strings.xml index 5bc5df4d7c26..67500866f3d4 100644 --- a/packages/SystemUI/res-keyguard/values-ms/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ms/strings.xml @@ -101,9 +101,6 @@ "Tiada perkhidmatan." "Tukar kaedah masukan" "Mod Pesawat" - "PIN diperlukan untuk menyediakan kemas kini" - "Corak diperlukan untuk menyediakan kemas kini" - "Kata laluan diperlukan untuk menyediakan kemas kini" "Corak diperlukan setelah peranti dimulakan semula" "PIN diperlukan setelah peranti dimulakan semula" "Kata laluan diperlukan setelah peranti dimulakan semula" diff --git a/packages/SystemUI/res-keyguard/values-my/strings.xml b/packages/SystemUI/res-keyguard/values-my/strings.xml index 43732d8ff260..3b32f06e19cd 100644 --- a/packages/SystemUI/res-keyguard/values-my/strings.xml +++ b/packages/SystemUI/res-keyguard/values-my/strings.xml @@ -101,9 +101,6 @@ "ဝန်ဆောင်မှု မရှိပါ။" "စာရိုက်စနစ်ပြောင်းရန်" "လေယာဉ်ပျံမုဒ်" - "အပ်ဒိတ်အတွက် ပြင်ဆင်ရန် ပင်နံပါတ် လိုပါသည်" - "အပ်ဒိတ်အတွက် ပြင်ဆင်ရန် ပုံစံလိုပါသည်" - "အပ်ဒိတ်အတွက် ပြင်ဆင်ရန် စကားဝှက် လိုပါသည်" "စက်ပစ္စည်းကို ပိတ်ပြီးပြန်ဖွင့်လိုက်သည့်အခါတွင် ပုံစံ လိုအပ်ပါသည်" "စက်ပစ္စည်းကို ပိတ်ပြီးပြန်ဖွင့်လိုက်သည့်အခါတွင် ပင်နံပါတ် လိုအပ်ပါသည်" "စက်ပစ္စည်းကို ပိတ်ပြီးပြန်ဖွင့်လိုက်သည့်အခါတွင် စကားဝှက် လိုအပ်ပါသည်" diff --git a/packages/SystemUI/res-keyguard/values-nb/strings.xml b/packages/SystemUI/res-keyguard/values-nb/strings.xml index 6dd3b2ad6e72..ebd8f2922ba2 100644 --- a/packages/SystemUI/res-keyguard/values-nb/strings.xml +++ b/packages/SystemUI/res-keyguard/values-nb/strings.xml @@ -101,9 +101,6 @@ "Ingen tilkobling." "Bytt inndatametode" "Flymodus" - "PIN-koden kreves for å klargjøre for oppdateringen" - "Mønsteret kreves for å klargjøre for oppdateringen" - "Passordet kreves for å klargjøre for oppdateringen" "Du må tegne mønsteret etter at enheten har startet på nytt" "Du må skrive inn PIN-koden etter at enheten har startet på nytt" "Du må skrive inn passordet etter at enheten har startet på nytt" diff --git a/packages/SystemUI/res-keyguard/values-ne/strings.xml b/packages/SystemUI/res-keyguard/values-ne/strings.xml index a1e6d62234e9..ce05e38dca10 100644 --- a/packages/SystemUI/res-keyguard/values-ne/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ne/strings.xml @@ -101,9 +101,6 @@ "सेवा उपलब्ध छैन।" "इनपुट विधिलाई स्विच गर्नुहोस्" "हवाइजहाज मोड" - "अद्यावधिक गर्ने कार्यका लागि तयार पार्न PIN चाहिन्छ" - "अद्यावधिक गर्ने कार्यका लागि तयार पार्न प्याटर्न चाहिन्छ" - "अद्यावधिक गर्ने कार्यका लागि तयार पार्न पासवर्ड चाहिन्छ" "यन्त्र पुनः सुरु भएपछि ढाँचा आवश्यक पर्दछ" "यन्त्र पुनः सुरु भएपछि PIN आवश्यक पर्दछ" "यन्त्र पुनः सुरु भएपछि पासवर्ड आवश्यक पर्दछ" diff --git a/packages/SystemUI/res-keyguard/values-nl/strings.xml b/packages/SystemUI/res-keyguard/values-nl/strings.xml index f3c35a405bd6..aa783e84b892 100644 --- a/packages/SystemUI/res-keyguard/values-nl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-nl/strings.xml @@ -101,9 +101,6 @@ "Geen service." "Invoermethode wijzigen" "Vliegtuigmodus" - "Pincode vereist voor voorbereiding op update" - "Patroon vereist voor voorbereiding op update" - "Wachtwoord vereist voor voorbereiding op update" "Patroon vereist nadat het apparaat opnieuw is opgestart" "Pincode vereist nadat het apparaat opnieuw is opgestart" "Wachtwoord vereist nadat het apparaat opnieuw is opgestart" diff --git a/packages/SystemUI/res-keyguard/values-or/strings.xml b/packages/SystemUI/res-keyguard/values-or/strings.xml index e92dc42680e1..8bbdcf1e9eb6 100644 --- a/packages/SystemUI/res-keyguard/values-or/strings.xml +++ b/packages/SystemUI/res-keyguard/values-or/strings.xml @@ -101,9 +101,6 @@ "କୌଣସି ସେବା ନାହିଁ।" "ଇନପୁଟ୍‌ ପଦ୍ଧତି ବଦଳାନ୍ତୁ" "ଏରୋପ୍ଲେନ୍‍ ମୋଡ୍" - "ଅପଡେଟ୍ ପାଇଁ ପ୍ରସ୍ତୁତ ହେବାକୁ PIN ଆବଶ୍ୟକ" - "ଅପଡେଟ୍ ପାଇଁ ପ୍ରସ୍ତୁତ ହେବାକୁ ପାଟର୍ନ ଆବଶ୍ୟକ" - "ଅପଡେଟ୍ ପାଇଁ ପ୍ରସ୍ତୁତ ହେବାକୁ ପାସୱାର୍ଡ ଆବଶ୍ୟକ" "ଡିଭାଇସ୍‍ ରିଷ୍ଟାର୍ଟ ହେବା ପରେ ପାଟର୍ନ ଆବଶ୍ୟକ ଅଟେ" "ଡିଭାଇସ୍‍ ରିଷ୍ଟାର୍ଟ ହେବାପରେ ପାସ୍‌ୱର୍ଡ ଆବଶ୍ୟକ" "ଡିଭାଇସ୍‍ ରିଷ୍ଟାର୍ଟ ହେବା ପରେ ପାସୱର୍ଡ ଆବଶ୍ୟକ ଅଟେ" diff --git a/packages/SystemUI/res-keyguard/values-pa/strings.xml b/packages/SystemUI/res-keyguard/values-pa/strings.xml index 5c83ab8a354c..78e066526840 100644 --- a/packages/SystemUI/res-keyguard/values-pa/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pa/strings.xml @@ -101,9 +101,6 @@ "ਕੋਈ ਸੇਵਾ ਨਹੀਂ।" "ਇਨਪੁੱਟ ਵਿਧੀ ਸਵਿੱਚ ਕਰੋ" "ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ" - "ਅੱਪਡੇਟ ਨੂੰ ਤਿਆਰ ਕਰਨ ਲਈ ਪਿੰਨ ਲੋੜੀਂਦਾ ਹੈ" - "ਅੱਪਡੇਟ ਨੂੰ ਤਿਆਰ ਕਰਨ ਲਈ ਪੈਟਰਨ ਲੋੜੀਂਦਾ ਹੈ" - "ਅੱਪਡੇਟ ਨੂੰ ਤਿਆਰ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਹੈ" "ਡੀਵਾਈਸ ਦੇ ਮੁੜ-ਚਾਲੂ ਹੋਣ \'ਤੇ ਪੈਟਰਨ ਦੀ ਲੋੜ ਹੈ" "ਡੀਵਾਈਸ ਦੇ ਮੁੜ-ਚਾਲੂ ਹੋਣ \'ਤੇ ਪਿੰਨ ਦੀ ਲੋੜ ਹੈ" "ਡੀਵਾਈਸ ਦੇ ਮੁੜ-ਚਾਲੂ ਹੋਣ \'ਤੇ ਪਾਸਵਰਡ ਦੀ ਲੋੜ ਹੈ" diff --git a/packages/SystemUI/res-keyguard/values-pl/strings.xml b/packages/SystemUI/res-keyguard/values-pl/strings.xml index 5f1df3e109b1..5094cf9983a1 100644 --- a/packages/SystemUI/res-keyguard/values-pl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pl/strings.xml @@ -107,9 +107,6 @@ "Brak usługi." "Przełączanie metody wprowadzania" "Tryb samolotowy" - "Aby przygotować się do aktualizacji, wymagany jest kod PIN" - "Aby przygotować się do aktualizacji, wymagany jest wzór" - "Aby przygotować się do aktualizacji, wymagane jest hasło" "Po ponownym uruchomieniu urządzenia wymagany jest wzór" "Po ponownym uruchomieniu urządzenia wymagany jest kod PIN" "Po ponownym uruchomieniu urządzenia wymagane jest hasło" diff --git a/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml index 1e47efa2cc4f..5bfc3dbc900d 100644 --- a/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml @@ -101,9 +101,6 @@ "Sem serviço." "Alterar o método de entrada" "Modo avião" - "Insira o PIN para se preparar para a atualização" - "Insira o padrão para se preparar para a atualização" - "Insira a senha para se preparar para a atualização" "O padrão é exigido após a reinicialização do dispositivo" "O PIN é exigido após a reinicialização do dispositivo" "A senha é exigida após a reinicialização do dispositivo" diff --git a/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml index 09cfcf1da02f..5af8bc09a05b 100644 --- a/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml @@ -101,9 +101,6 @@ "Sem serviço." "Alternar o método de introdução" "Modo de avião" - "É necessário introduzir o PIN para a preparação para a atualização." - "É necessário introduzir o padrão para a preparação para a atualização." - "É necessário introduzir a palavra-passe para a preparação para a atualização." "É necessário um padrão após reiniciar o dispositivo" "É necessário um PIN após reiniciar o dispositivo" "É necessária uma palavra-passe após reiniciar o dispositivo" diff --git a/packages/SystemUI/res-keyguard/values-pt/strings.xml b/packages/SystemUI/res-keyguard/values-pt/strings.xml index 1e47efa2cc4f..5bfc3dbc900d 100644 --- a/packages/SystemUI/res-keyguard/values-pt/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pt/strings.xml @@ -101,9 +101,6 @@ "Sem serviço." "Alterar o método de entrada" "Modo avião" - "Insira o PIN para se preparar para a atualização" - "Insira o padrão para se preparar para a atualização" - "Insira a senha para se preparar para a atualização" "O padrão é exigido após a reinicialização do dispositivo" "O PIN é exigido após a reinicialização do dispositivo" "A senha é exigida após a reinicialização do dispositivo" diff --git a/packages/SystemUI/res-keyguard/values-ro/strings.xml b/packages/SystemUI/res-keyguard/values-ro/strings.xml index 7df2db6f03f1..8122241e6613 100644 --- a/packages/SystemUI/res-keyguard/values-ro/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ro/strings.xml @@ -104,9 +104,6 @@ "Fără serviciu." "Comutați metoda de introducere" "Mod Avion" - "Pentru a vă pregăti pentru actualizare este necesar codul PIN" - "Pentru a vă pregăti pentru actualizare este necesar modelul" - "Pentru a vă pregăti pentru actualizare este necesară parola" "Modelul este necesar după repornirea dispozitivului" "Codul PIN este necesar după repornirea dispozitivului" "Parola este necesară după repornirea dispozitivului" diff --git a/packages/SystemUI/res-keyguard/values-ru/strings.xml b/packages/SystemUI/res-keyguard/values-ru/strings.xml index ccd3c968cd51..b80b479ca29a 100644 --- a/packages/SystemUI/res-keyguard/values-ru/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ru/strings.xml @@ -107,9 +107,6 @@ "Нет сигнала." "Сменить способ ввода" "Режим полета" - "Для подготовки к обновлению необходимо ввести PIN-код." - "Для подготовки к обновлению необходимо ввести графический ключ." - "Для подготовки к обновлению необходимо ввести пароль." "После перезагрузки устройства необходимо ввести графический ключ" "После перезагрузки устройства необходимо ввести PIN-код" "После перезагрузки устройства необходимо ввести пароль" diff --git a/packages/SystemUI/res-keyguard/values-si/strings.xml b/packages/SystemUI/res-keyguard/values-si/strings.xml index 3dfc282ccae5..1cd876f15d47 100644 --- a/packages/SystemUI/res-keyguard/values-si/strings.xml +++ b/packages/SystemUI/res-keyguard/values-si/strings.xml @@ -101,9 +101,6 @@ "සේවාව නැත." "ආදාන ක්‍රමය මාරු කිරීම" "ගුවන් යානා ප්‍රකාරය" - "යාවත්කාලීනය සඳහා සුදානම් කිරීමට PIN අවශ්‍යය" - "යාවත්කාලීනය සඳහා සුදානම් කිරීමට රටාව අවශ්‍යය" - "යාවත්කාලීනය සඳහා සුදානම් කිරීමට මුරපදය අවශ්‍යය" "උපාංගය නැවත ආරම්භ වූ පසු රටාව අවශ්‍යයි" "උපාංගය නැවත ආරම්භ වූ පසු PIN අංකය අවශ්‍යයි" "උපාංගය නැවත ආරම්භ වූ පසු මුරපදය අවශ්‍යයි" diff --git a/packages/SystemUI/res-keyguard/values-sk/strings.xml b/packages/SystemUI/res-keyguard/values-sk/strings.xml index 8568e14fecc3..801a7dbccf6d 100644 --- a/packages/SystemUI/res-keyguard/values-sk/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sk/strings.xml @@ -107,9 +107,6 @@ "Žiadny signál." "Prepnúť metódu vstupu" "Režim v lietadle" - "Príprava na aktualizáciu vyžaduje zadanie kódu PIN" - "Príprava na aktualizáciu vyžaduje zadanie vzoru" - "Príprava na aktualizáciu vyžaduje zadanie hesla" "Po reštartovaní zariadenia musíte zadať bezpečnostný vzor" "Po reštartovaní zariadenia musíte zadať kód PIN" "Po reštartovaní zariadenia musíte zadať heslo" diff --git a/packages/SystemUI/res-keyguard/values-sl/strings.xml b/packages/SystemUI/res-keyguard/values-sl/strings.xml index 168158d9d602..967255cb50e7 100644 --- a/packages/SystemUI/res-keyguard/values-sl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sl/strings.xml @@ -107,9 +107,6 @@ "Ni storitve." "Preklop načina vnosa" "Način za letalo" - "Za pripravo na posodobitev morate vnesti kodo PIN" - "Za pripravo na posodobitev morate vnesti vzorec" - "Za pripravo na posodobitev morate vnesti geslo" "Po vnovičnem zagonu naprave je treba vnesti vzorec" "Po vnovičnem zagonu naprave je treba vnesti kodo PIN" "Po vnovičnem zagonu naprave je treba vnesti geslo" diff --git a/packages/SystemUI/res-keyguard/values-sq/strings.xml b/packages/SystemUI/res-keyguard/values-sq/strings.xml index 14973f82dc4d..382a4dcafed7 100644 --- a/packages/SystemUI/res-keyguard/values-sq/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sq/strings.xml @@ -101,9 +101,6 @@ "Nuk ka shërbim." "Ndërro metodën e hyrjes" "Modaliteti i aeroplanit" - "Kërkohet kodi PIN për t\'u përgatitur për përditësimin" - "Kërkohet motivi për t\'u përgatitur për përditësimin" - "Kërkohet fjalëkalimi për t\'u përgatitur për përditësimin" "Kërkohet motivi pas rinisjes së pajisjes" "Kërkohet kodi PIN pas rinisjes së pajisjes" "Kërkohet fjalëkalimi pas rinisjes së pajisjes" diff --git a/packages/SystemUI/res-keyguard/values-sr/strings.xml b/packages/SystemUI/res-keyguard/values-sr/strings.xml index 24a1125f9a7d..f83df3f8925e 100644 --- a/packages/SystemUI/res-keyguard/values-sr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sr/strings.xml @@ -104,9 +104,6 @@ "Мрежа није доступна." "Промени метод уноса" "Режим рада у авиону" - "PIN је обавезан ради припреме за ажурирање" - "Шаблон је обавезан ради припреме за ажурирање" - "Лозинка је обавезна ради припреме за ажурирање" "Треба да унесете шаблон када се уређај поново покрене" "Треба да унесете PIN када се уређај поново покрене" "Треба да унесете лозинку када се уређај поново покрене" diff --git a/packages/SystemUI/res-keyguard/values-sv/strings.xml b/packages/SystemUI/res-keyguard/values-sv/strings.xml index a37c4809ccdb..a037bffa4da2 100644 --- a/packages/SystemUI/res-keyguard/values-sv/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sv/strings.xml @@ -101,9 +101,6 @@ "Ingen tjänst." "Byt inmatningsmetod" "Flygplansläge" - "Pinkod krävs för att förbereda för uppdatering" - "Grafiskt lösenord krävs för att förbereda för uppdatering" - "Lösenord krävs för att förbereda för uppdatering" "Du måste ange grafiskt lösenord när du har startat om enheten" "Du måste ange pinkod när du har startat om enheten" "Du måste ange lösenord när du har startat om enheten" diff --git a/packages/SystemUI/res-keyguard/values-sw/strings.xml b/packages/SystemUI/res-keyguard/values-sw/strings.xml index c4a9a1445ceb..efa5ecfd44fd 100644 --- a/packages/SystemUI/res-keyguard/values-sw/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sw/strings.xml @@ -101,9 +101,6 @@ "Hakuna mtandao." "Kubadili mbinu ya kuingiza data" "Hali ya ndegeni" - "Inahitaji PIN ili kujiandaa kwa ajili ya sasisho" - "Inahitaji mchoro ili kujiandaa kwa ajili ya sasisho" - "Inahitaji nenosiri ili kujiandaa kwa ajili ya sasisho" "Unafaa kuchora mchoro baada ya kuwasha kifaa upya" "Unafaa kuweka PIN baada ya kuwasha kifaa upya" "Unafaa kuweka nenosiri baada ya kuwasha kifaa upya" diff --git a/packages/SystemUI/res-keyguard/values-ta/strings.xml b/packages/SystemUI/res-keyguard/values-ta/strings.xml index a4dc0be3496f..96dbbb0314d6 100644 --- a/packages/SystemUI/res-keyguard/values-ta/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ta/strings.xml @@ -101,9 +101,6 @@ "சேவை இல்லை." "உள்ளீட்டு முறையை மாற்றும்" "விமானப் பயன்முறை" - "புதுப்பிப்பிற்குத் தயார்செய்ய பின் தேவை" - "புதுப்பிப்பிற்குத் தயார்செய்ய பேட்டர்ன் தேவை" - "புதுப்பிப்பிற்குத் தயார்செய்ய கடவுச்சொல் தேவை" "சாதனத்தை மீண்டும் தொடங்கியதும், பேட்டர்னை வரைய வேண்டும்" "சாதனத்தை மீண்டும் தொடங்கியதும், பின்னை உள்ளிட வேண்டும்" "சாதனத்தை மீண்டும் தொடங்கியதும், கடவுச்சொல்லை உள்ளிட வேண்டும்" diff --git a/packages/SystemUI/res-keyguard/values-te/strings.xml b/packages/SystemUI/res-keyguard/values-te/strings.xml index 3e27ce8ba702..74386bc7a487 100644 --- a/packages/SystemUI/res-keyguard/values-te/strings.xml +++ b/packages/SystemUI/res-keyguard/values-te/strings.xml @@ -101,9 +101,6 @@ "సేవ లేదు." "ఇన్‌పుట్ పద్ధతిని మార్చు" "విమానం మోడ్" - "అప్‌డేట్‌కు సిద్ధం చేయడానికి పిన్ అవసరం" - "అప్‌డేట్‌కు సిద్ధం చేయడానికి ఆకృతి అవసరం" - "అప్‌డేట్‌కు సిద్ధం చేయడానికి పాస్‌వర్డ్ అవసరం" "పరికరాన్ని పునఃప్రారంభించిన తర్వాత నమూనాను గీయాలి" "డివైజ్‌ను పునఃప్రారంభించిన తర్వాత పిన్ నమోదు చేయాలి" "పరికరాన్ని పునఃప్రారంభించిన తర్వాత పాస్‌వర్డ్‌ను నమోదు చేయాలి" diff --git a/packages/SystemUI/res-keyguard/values-th/strings.xml b/packages/SystemUI/res-keyguard/values-th/strings.xml index 48ae2ceb9fbd..e157be4ac18e 100644 --- a/packages/SystemUI/res-keyguard/values-th/strings.xml +++ b/packages/SystemUI/res-keyguard/values-th/strings.xml @@ -101,9 +101,6 @@ "ไม่มีบริการ" "สลับวิธีการป้อนข้อมูล" "โหมดบนเครื่องบิน" - "ต้องใช้ PIN เพื่อเตรียมรับการอัปเดต" - "ต้องใช้รูปแบบเพื่อเตรียมรับการอัปเดต" - "ต้องใช้รหัสผ่านเพื่อเตรียมรับการอัปเดต" "ต้องวาดรูปแบบหลังจากอุปกรณ์รีสตาร์ท" "ต้องระบุ PIN หลังจากอุปกรณ์รีสตาร์ท" "ต้องป้อนรหัสผ่านหลังจากอุปกรณ์รีสตาร์ท" diff --git a/packages/SystemUI/res-keyguard/values-tl/strings.xml b/packages/SystemUI/res-keyguard/values-tl/strings.xml index bd87b20a2ccb..7b7e17dc8dcb 100644 --- a/packages/SystemUI/res-keyguard/values-tl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-tl/strings.xml @@ -101,9 +101,6 @@ "Walang serbisyo." "Magpalit ng pamamaraan ng pag-input" "Airplane mode" - "Kinakailangan ang PIN para makapaghanda sa pag-update" - "Kinakailangan ang pattern para makapaghanda sa pag-update" - "Kinakailangan ang password para makapaghanda sa pag-update" "Kailangan ng pattern pagkatapos mag-restart ng device" "Kailangan ng PIN pagkatapos mag-restart ng device" "Kailangan ng password pagkatapos mag-restart ng device" diff --git a/packages/SystemUI/res-keyguard/values-tr/strings.xml b/packages/SystemUI/res-keyguard/values-tr/strings.xml index cf37451a9ed8..8c0caead0bdb 100644 --- a/packages/SystemUI/res-keyguard/values-tr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-tr/strings.xml @@ -101,9 +101,6 @@ "Hizmet yok." "Giriş yöntemini değiştir" "Uçak modu" - "Güncellemenin hazırlanması için PIN gerekli" - "Güncellemenin hazırlanması için desen gerekli" - "Güncellemenin hazırlanması için şifre gerekli" "Cihaz yeniden başladıktan sonra desen gerekir" "Cihaz yeniden başladıktan sonra PIN gerekir" "Cihaz yeniden başladıktan sonra şifre gerekir" diff --git a/packages/SystemUI/res-keyguard/values-uk/strings.xml b/packages/SystemUI/res-keyguard/values-uk/strings.xml index 0ccd012c5221..6e5ce0f142dc 100644 --- a/packages/SystemUI/res-keyguard/values-uk/strings.xml +++ b/packages/SystemUI/res-keyguard/values-uk/strings.xml @@ -107,9 +107,6 @@ "Зв’язку немає." "Змінити метод введення" "Режим польоту" - "Щоб підготуватися до оновлення, введіть PIN-код" - "Щоб підготуватися до оновлення, введіть ключ" - "Щоб підготуватися до оновлення, введіть пароль" "Після перезавантаження пристрою потрібно ввести ключ" "Після перезавантаження пристрою потрібно ввести PIN-код" "Після перезавантаження пристрою потрібно ввести пароль" diff --git a/packages/SystemUI/res-keyguard/values-ur/strings.xml b/packages/SystemUI/res-keyguard/values-ur/strings.xml index 22a477e3d63f..0fd5e17c953e 100644 --- a/packages/SystemUI/res-keyguard/values-ur/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ur/strings.xml @@ -101,9 +101,6 @@ "کوئی سروس نہیں ہے۔" "اندراج کا طریقہ سوئچ کریں" "ہوائی جہاز وضع" - "‏اپ ڈیٹ تیار کرنے کے لیے PIN درکار ہے" - "اپ ڈیٹ تیار کرنے کے لیے پیٹرن درکار ہے" - "اپ ڈیٹ تیار کرنے کے لیے پاس ورڈ درکار ہے" "آلہ دوبارہ چالو ہونے کے بعد پیٹرن درکار ہوتا ہے" "‏آلہ دوبارہ چالو ہونے کے بعد PIN درکار ہوتا ہے" "آلہ دوبارہ چالو ہونے کے بعد پاسورڈ درکار ہوتا ہے" diff --git a/packages/SystemUI/res-keyguard/values-uz/strings.xml b/packages/SystemUI/res-keyguard/values-uz/strings.xml index 72d4fae575b8..323fea5a608e 100644 --- a/packages/SystemUI/res-keyguard/values-uz/strings.xml +++ b/packages/SystemUI/res-keyguard/values-uz/strings.xml @@ -101,9 +101,6 @@ "Aloqa yo‘q." "Matn kiritish usulini almashtirish" "Parvoz rejimi" - "Yangilashga tayyorlash uchun PIN kod talab etiladi" - "Yangilashga tayyorlash uchun grafik kalit talab etiladi" - "Yangilashga tayyorlash uchun parol talab etiladi" "Qurilma o‘chirib yoqilgandan keyin grafik kalit talab qilinadi" "Qurilma o‘chirib yoqilgandan keyin PIN kod talab qilinadi" "Qurilma o‘chirib yoqilgandan keyin parol talab qilinadi" diff --git a/packages/SystemUI/res-keyguard/values-vi/strings.xml b/packages/SystemUI/res-keyguard/values-vi/strings.xml index de642f3cc27c..2ba5089c7ed9 100644 --- a/packages/SystemUI/res-keyguard/values-vi/strings.xml +++ b/packages/SystemUI/res-keyguard/values-vi/strings.xml @@ -101,9 +101,6 @@ "Không có dịch vụ." "Chuyển phương thức nhập" "Chế độ trên máy bay" - "Cần nhập mã PIN để chuẩn bị cập nhật" - "Cần nhập hình mở khóa để chuẩn bị cập nhật" - "Cần nhập mật khẩu để chuẩn bị cập nhật" "Yêu cầu hình mở khóa sau khi thiết bị khởi động lại" "Yêu cầu mã PIN sau khi thiết bị khởi động lại" "Yêu cầu mật khẩu sau khi thiết bị khởi động lại" diff --git a/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml index be162b0b5790..b4bff5fab6d6 100644 --- a/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml @@ -101,9 +101,6 @@ "无服务。" "切换输入法" "飞行模式" - "需要输入 PIN 码才能让设备做好更新准备" - "需要绘制解锁图案才能让设备做好更新准备" - "需要输入密码才能让设备做好更新准备" "重启设备后需要绘制解锁图案" "重启设备后需要输入 PIN 码" "重启设备后需要输入密码" diff --git a/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml index 33e5b44ac31e..b3d387706fa5 100644 --- a/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml @@ -101,9 +101,6 @@ "沒有服務。" "轉換輸入方法" "飛行模式" - "必須提供 PIN 碼，才能準備進行更新" - "必須畫出上鎖圖案，才能準備進行更新" - "必須輸入密碼，才能準備進行更新" "裝置重新啟動後，必須畫出上鎖圖案才能使用" "裝置重新啟動後，必須輸入 PIN 碼才能使用" "裝置重新啟動後，必須輸入密碼才能使用" diff --git a/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml index 763233cc2e15..03dec4852771 100644 --- a/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml @@ -101,9 +101,6 @@ "沒有服務。" "切換輸入法" "飛航模式" - "請輸入 PIN 碼，以便為更新作業進行準備" - "請畫出解鎖圖案，以便為更新作業進行準備" - "請輸入密碼，以便為更新作業進行準備" "裝置重新啟動後需要畫出解鎖圖案" "裝置重新啟動後需要輸入 PIN 碼" "裝置重新啟動後需要輸入密碼" diff --git a/packages/SystemUI/res-keyguard/values-zu/strings.xml b/packages/SystemUI/res-keyguard/values-zu/strings.xml index 397c868e6547..5ab567f706c3 100644 --- a/packages/SystemUI/res-keyguard/values-zu/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zu/strings.xml @@ -101,9 +101,6 @@ "Ayikho isevisi" "Shintsha indlela yokufaka" "Imodi yendiza" - "Iphinikhodi iyadingeka ukuze kulungiselelwe isibuyekezo" - "Iphethini iyadingeka ukuze kulungiselelwe isibuyekezo" - "Iphasiwedi iyadingeka ukuze kulungiselelwe isibuyekezo" "Iphethini iyadingeka ngemuva kokuqala kabusha kwedivayisi" "Iphinikhodi iyadingeka ngemuva kokuqala kabusha kwedivayisi" "Iphasiwedi iyadingeka ngemuva kokuqala kabusha kwedivayisi" diff --git a/packages/SystemUI/res-keyguard/values/strings.xml b/packages/SystemUI/res-keyguard/values/strings.xml index 4d184d5758d3..f7e9fedd5f66 100644 --- a/packages/SystemUI/res-keyguard/values/strings.xml +++ b/packages/SystemUI/res-keyguard/values/strings.xml @@ -240,15 +240,6 @@ Airplane mode - - PIN required to prepare for update - - - Pattern required to prepare for update - - - Password required to prepare for update - Pattern required after device restarts diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java index 65bf7e6e5025..97317cf5580f 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java @@ -138,7 +138,7 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView case PROMPT_REASON_USER_REQUEST: return R.string.kg_prompt_reason_user_request; case PROMPT_REASON_PREPARE_FOR_UPDATE: - return R.string.kg_prompt_reason_prepare_for_update_password; + return R.string.kg_prompt_reason_timeout_password; case PROMPT_REASON_NONE: return 0; default: diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java index ad92f8f623e4..c4a9fcb45284 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java @@ -440,8 +440,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_user_request); break; case PROMPT_REASON_PREPARE_FOR_UPDATE: - mSecurityMessageDisplay.setMessage( - R.string.kg_prompt_reason_prepare_for_update_pattern); + mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_timeout_pattern); break; case PROMPT_REASON_NONE: break; diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java index 6d865ab525f3..c7f27cf8a71a 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java @@ -117,7 +117,7 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView case PROMPT_REASON_USER_REQUEST: return R.string.kg_prompt_reason_user_request; case PROMPT_REASON_PREPARE_FOR_UPDATE: - return R.string.kg_prompt_reason_prepare_for_update_pin; + return R.string.kg_prompt_reason_timeout_pin; case PROMPT_REASON_NONE: return 0; default: -- cgit v1.2.3-59-g8ed1b From bb2eb8cc3206a37d5d36e09aaec648675fe77249 Mon Sep 17 00:00:00 2001 From: Wilson Wu Date: Fri, 17 Jul 2020 23:50:45 +0800 Subject: Prevent exception when surrounding text retrieval We use same reference from TextView to set the initial surrounding text. The actual surrounding text may be modified before retrieval since the mSurroundingText is mutable. Use a copy of subText should avoid this concurrent issue. Bug: 160390184 Test: atest FrameworksCoreTests:EditorInfoTest Change-Id: I6082a4cae2fcdc4c529dc14e2e5e7a45ab1aae4d (cherry picked from commit 0ebe70cb0fa685693d7834b4b4ee94515149c8fb) --- core/java/android/view/inputmethod/EditorInfo.java | 10 ++++++---- .../src/android/view/inputmethod/EditorInfoTest.java | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/core/java/android/view/inputmethod/EditorInfo.java b/core/java/android/view/inputmethod/EditorInfo.java index 07fef76961f9..c5f2299e4f83 100644 --- a/core/java/android/view/inputmethod/EditorInfo.java +++ b/core/java/android/view/inputmethod/EditorInfo.java @@ -27,6 +27,7 @@ import android.os.LocaleList; import android.os.Parcel; import android.os.Parcelable; import android.os.UserHandle; +import android.text.Editable; import android.text.InputType; import android.text.TextUtils; import android.util.Printer; @@ -567,7 +568,8 @@ public class EditorInfo implements InputType, Parcelable { * editor wants to trim out the first 10 chars, subTextStart should be 10. */ public void setInitialSurroundingSubText(@NonNull CharSequence subText, int subTextStart) { - Objects.requireNonNull(subText); + CharSequence newSubText = Editable.Factory.getInstance().newEditable(subText); + Objects.requireNonNull(newSubText); // Swap selection start and end if necessary. final int subTextSelStart = initialSelStart > initialSelEnd @@ -575,7 +577,7 @@ public class EditorInfo implements InputType, Parcelable { final int subTextSelEnd = initialSelStart > initialSelEnd ? initialSelStart - subTextStart : initialSelEnd - subTextStart; - final int subTextLength = subText.length(); + final int subTextLength = newSubText.length(); // Unknown or invalid selection. if (subTextStart < 0 || subTextSelStart < 0 || subTextSelEnd > subTextLength) { mInitialSurroundingText = new InitialSurroundingText(); @@ -589,12 +591,12 @@ public class EditorInfo implements InputType, Parcelable { } if (subTextLength <= MEMORY_EFFICIENT_TEXT_LENGTH) { - mInitialSurroundingText = new InitialSurroundingText(subText, subTextSelStart, + mInitialSurroundingText = new InitialSurroundingText(newSubText, subTextSelStart, subTextSelEnd); return; } - trimLongSurroundingText(subText, subTextSelStart, subTextSelEnd); + trimLongSurroundingText(newSubText, subTextSelStart, subTextSelEnd); } /** diff --git a/core/tests/coretests/src/android/view/inputmethod/EditorInfoTest.java b/core/tests/coretests/src/android/view/inputmethod/EditorInfoTest.java index 02ffc00dcba5..93de03adfa84 100644 --- a/core/tests/coretests/src/android/view/inputmethod/EditorInfoTest.java +++ b/core/tests/coretests/src/android/view/inputmethod/EditorInfoTest.java @@ -264,6 +264,25 @@ public class EditorInfoTest { InputConnection.GET_TEXT_WITH_STYLES))); } + @Test + public void surroundingTextRetrieval_writeToParcel_noException() { + StringBuilder sb = new StringBuilder("abcdefg"); + Parcel parcel = Parcel.obtain(); + EditorInfo editorInfo = new EditorInfo(); + editorInfo.initialSelStart = 2; + editorInfo.initialSelEnd = 5; + editorInfo.inputType = EditorInfo.TYPE_CLASS_TEXT; + + editorInfo.setInitialSurroundingText(sb); + sb.setLength(0); + editorInfo.writeToParcel(parcel, 0); + + try { + editorInfo.getInitialTextBeforeCursor(60, 1); + fail("Test shouldn't have exception"); + } catch (AssertionError e) { } + } + private static void assertExpectedTextLength(EditorInfo editorInfo, @Nullable Integer expectBeforeCursorLength, @Nullable Integer expectSelectionLength, @Nullable Integer expectAfterCursorLength) { -- cgit v1.2.3-59-g8ed1b From 95004885f89d4118d3525acd1b312795879eea12 Mon Sep 17 00:00:00 2001 From: Taran Singh Date: Tue, 21 Jul 2020 14:30:25 -0700 Subject: Fix NavigationBarColorTest Manually partially revert I4910c2a06cc67b0470477b245fc1de54b75f10f9 so that we don't use a window that's animating away as control target. Fix: 161659326 Bug: 153145997 Test: atest NavigationBarColorTest#testSetNavigationBarColor Change-Id: I68db516c91da69e0f4dcbdfab6d6a757c4cdc75b (cherry picked from commit 588fa46cf4d6604b9050d67cbe2a596d52d4f6c3) --- .../java/com/android/server/wm/DisplayContent.java | 12 ------------ .../core/java/com/android/server/wm/WindowState.java | 3 --- .../com/android/server/wm/DisplayContentTests.java | 20 -------------------- 3 files changed, 35 deletions(-) diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 5d3f3c0401ef..06c0c4656332 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -3606,18 +3606,6 @@ class DisplayContent extends WindowContainer implements WindowManagerP if (dc.mInputMethodInputTarget == this) { dc.setInputMethodInputTarget(null); } - if (dc.mInputMethodControlTarget == this) { - dc.updateImeControlTarget(); - } final int type = mAttrs.type; if (WindowManagerService.excludeWindowTypeFromTapOutTask(type)) { diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java index d6e038d8d027..66dfbfdda604 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java @@ -913,26 +913,6 @@ public class DisplayContentTests extends WindowTestsBase { assertEquals(dc.mInputMethodInputTarget, dc.computeImeControlTarget()); } - @Test - public void testComputeImeControlTarget_exitingApp() throws Exception { - final DisplayContent dc = createNewDisplay(); - - WindowState exitingWin = createWindow(null, TYPE_BASE_APPLICATION, "exiting app"); - makeWindowVisible(exitingWin); - exitingWin.mWinAnimator.mDrawState = WindowStateAnimator.HAS_DRAWN; - exitingWin.mAnimatingExit = true; - - dc.mInputMethodControlTarget = exitingWin; - dc.mInputMethodTarget = dc.mInputMethodInputTarget = - createWindow(null, TYPE_BASE_APPLICATION, "starting app"); - - assertEquals(exitingWin, dc.computeImeControlTarget()); - - exitingWin.removeImmediately(); - - assertEquals(dc.mInputMethodInputTarget, dc.computeImeControlTarget()); - } - @Test public void testComputeImeControlTarget_splitscreen() throws Exception { final DisplayContent dc = createNewDisplay(); -- cgit v1.2.3-59-g8ed1b From cc051fe9cfb890030b2972ec369d6115d35ba360 Mon Sep 17 00:00:00 2001 From: Patrick Baumann Date: Wed, 22 Jul 2020 11:48:57 -0700 Subject: Grant visibility even when not granting URI perm This change modifies the flow of uri permission grants to ensure that even when we're not granting URI permissions, we still take the opportunity to grant app visibility. This change also re-grants visibility based on any persisted URI grants at boot time. Bug: 161912313 Bug: 161721834 Change-Id: I077b263fc3dc01f3505c39fc0e36d3419bab3c5f (cherry picked from commit 9406f1dea8be7f1a72738990f536480bdf488a7c) --- .../android/server/uri/UriGrantsManagerService.java | 9 +++++++++ .../server/uri/UriGrantsManagerServiceTest.java | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/services/core/java/com/android/server/uri/UriGrantsManagerService.java b/services/core/java/com/android/server/uri/UriGrantsManagerService.java index 4b3ddd856c61..f14c3a53940d 100644 --- a/services/core/java/com/android/server/uri/UriGrantsManagerService.java +++ b/services/core/java/com/android/server/uri/UriGrantsManagerService.java @@ -51,6 +51,7 @@ import android.app.AppGlobals; import android.app.GrantedUriPermission; import android.app.IUriGrantsManager; import android.content.ClipData; +import android.content.ComponentName; import android.content.ContentProvider; import android.content.ContentResolver; import android.content.Context; @@ -698,6 +699,11 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub { final UriPermission perm = findOrCreateUriPermissionLocked( sourcePkg, targetPkg, targetUid, grantUri); perm.initPersistedModes(modeFlags, createdTime); + mPmInternal.grantImplicitAccess( + targetUserId, null, + UserHandle.getAppId(targetUid), + pi.applicationInfo.uid, + false /* direct */); } } else { Slog.w(TAG, "Persisted grant for " + uri + " had source " + sourcePkg @@ -1171,6 +1177,9 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub { // grant, we can skip generating any bookkeeping; when any advanced // features have been requested, we proceed below to make sure the // provider supports granting permissions + mPmInternal.grantImplicitAccess( + UserHandle.getUserId(targetUid), null, + UserHandle.getAppId(targetUid), pi.applicationInfo.uid, false); return -1; } diff --git a/services/tests/servicestests/src/com/android/server/uri/UriGrantsManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/uri/UriGrantsManagerServiceTest.java index 62b6a65cc6cb..614949c91b9a 100644 --- a/services/tests/servicestests/src/com/android/server/uri/UriGrantsManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/uri/UriGrantsManagerServiceTest.java @@ -43,11 +43,19 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; import android.content.ClipData; import android.content.Intent; import android.content.pm.ProviderInfo; import android.net.Uri; +import android.os.UserHandle; import android.util.ArraySet; import androidx.test.InstrumentationRegistry; @@ -62,6 +70,12 @@ public class UriGrantsManagerServiceTest { private UriGrantsMockContext mContext; private UriGrantsManagerInternal mService; + // we expect the following only during grant if a grant is expected + private void verifyNoVisibilityGrant() { + verify(mContext.mPmInternal, never()) + .grantImplicitAccess(anyInt(), any(), anyInt(), anyInt(), anyBoolean()); + } + @Before public void setUp() throws Exception { mContext = new UriGrantsMockContext(InstrumentationRegistry.getContext()); @@ -83,6 +97,7 @@ public class UriGrantsManagerServiceTest { assertEquals(UID_PRIMARY_SOCIAL, needed.targetUid); assertEquals(FLAG_READ, needed.flags); assertEquals(asSet(expectedGrant), needed.uris); + verifyNoVisibilityGrant(); } /** @@ -100,6 +115,7 @@ public class UriGrantsManagerServiceTest { assertEquals(UID_SECONDARY_SOCIAL, needed.targetUid); assertEquals(FLAG_READ, needed.flags); assertEquals(asSet(expectedGrant), needed.uris); + verifyNoVisibilityGrant(); } /** @@ -111,6 +127,8 @@ public class UriGrantsManagerServiceTest { final NeededUriGrants needed = mService.checkGrantUriPermissionFromIntent( intent, UID_PRIMARY_PUBLIC, PKG_SOCIAL, USER_PRIMARY); assertNull(needed); + verify(mContext.mPmInternal).grantImplicitAccess(eq(USER_PRIMARY), isNull(), eq( + UserHandle.getAppId(UID_PRIMARY_SOCIAL)), eq(UID_PRIMARY_PUBLIC), eq(false)); } /** @@ -128,6 +146,7 @@ public class UriGrantsManagerServiceTest { assertEquals(UID_SECONDARY_SOCIAL, needed.targetUid); assertEquals(FLAG_READ, needed.flags); assertEquals(asSet(expectedGrant), needed.uris); + verifyNoVisibilityGrant(); } /** -- cgit v1.2.3-59-g8ed1b From ed2c898865272fecf90a53ab5cbfaf81b1b5b5e5 Mon Sep 17 00:00:00 2001 From: Jing Ji Date: Tue, 21 Jul 2020 11:52:07 -0700 Subject: Java docs update: Advise not to include PII in setProcessStateSummary Bug: 161812603 Test: m -j offline-sdk-docs & manual verify the javadoc Change-Id: I741bbf7b83badcd7f1610f31bbd41a49b8b975fb (cherry picked from commit 3bda3bf8c6e06b910df1f219d983c803bcf49da6) --- core/java/android/app/ActivityManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index acf6315ddc5d..1059a6f2e868 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -3728,7 +3728,8 @@ public class ActivityManager { * manner, excessive calls to this API could result a {@link java.lang.RuntimeException}. *

* - * @param state The state data + * @param state The state data. To be advised, DO NOT include sensitive information/data + * (PII, SPII, or other sensitive user data) here. Maximum length is 128 bytes. */ public void setProcessStateSummary(@Nullable byte[] state) { try { -- cgit v1.2.3-59-g8ed1b From 61b6c2988821d6055a2d3b23eefddfd711f5c529 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Fri, 17 Jul 2020 16:10:13 -0700 Subject: Fix missing IME switcher icon (w/ a hardware keyboard) This is a follow up CL to our previous CL [1], which aimed to adjust the timing to change navbar icons that depend on the IME window visibility. One thing we overlooked is that only InputMethodService#IME_VISIBLE needed to be cleared to keep the back button icon to behave as if the IME window was invisible. For the IME switcher icon to work as intended, the current protocol requires InputMethodService.IME_ACTIVE to remain to be set even when an IME window is invisible as long as there is an active session between the app and the IME. [1]: I4dc9d6513d0559156f7da39244f3fc5ebc952ed4 c22eec9d35e797417b8630fff178ec53e7c29b65 Fix: 160283619 Test: Manually done as follows: 1. Build aosp_coral-userdebug and flash it 2. make -j SoftKeyboard 3. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk 4. adb shell ime enable com.example.android.softkeyboard/.SoftKeyboard 5. adb shell ime set com.example.android.softkeyboard/.SoftKeyboard 6. Open any app that has an EditText 7. Focus in to the EditText. Make sure the IME shows up and the IME switcher icon is visible on the navbar. 8. Attach a hardware keyboard. Make sure that the IME becomes hidden while the IME switcher icon remains to be visible on the navbar. 9. Detach the hardware keyboard. Make sure that the IME switcher icon remains to be visible on the navbar. Change-Id: I4a9ddf514a32a221c2372be0ca166fbdac555932 Merged-In: I4a9ddf514a32a221c2372be0ca166fbdac555932 (cherry picked from commit 5749b51f8c739f8fa82760a8a7868e9b05aa9dd2) --- .../java/com/android/server/inputmethod/InputMethodManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 0154fe07a418..254285dfbd41 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -2942,7 +2942,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub vis = 0; } if (!mCurPerceptible) { - vis = 0; + vis &= ~InputMethodService.IME_VISIBLE; } // mImeWindowVis should be updated before calling shouldShowImeSwitcherLocked(). final boolean needsToShowImeSwitcher = shouldShowImeSwitcherLocked(vis); -- cgit v1.2.3-59-g8ed1b From fd90ff85ebcca46186e14d668a8ea2fa03777338 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Wed, 22 Jul 2020 17:48:13 -0700 Subject: Skip bg PSS collection for apps using a camera Bug: 144138979 Test: grant camera appOp and observe logging Test: use camera app and observe logging Change-Id: I6422b432f0d6fcf411073c0528a4ee485d46f005 (cherry picked from commit 5a7e66275155eb1df02012132cd7104feb73251f) (cherry picked from commit fc76b97d1bc731b227be6bc756af743976bd3374) --- .../android/server/am/ActivityManagerService.java | 45 +++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 9994f6647699..ec24014f77d7 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -292,6 +292,7 @@ import android.util.ArrayMap; import android.util.ArraySet; import android.util.DebugUtils; import android.util.EventLog; +import android.util.IntArray; import android.util.Log; import android.util.Pair; import android.util.PrintWriterPrinter; @@ -311,6 +312,7 @@ import android.view.autofill.AutofillManagerInternal; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.app.IAppOpsActiveCallback; import com.android.internal.app.IAppOpsCallback; import com.android.internal.app.IAppOpsService; import com.android.internal.app.ProcessMap; @@ -654,6 +656,14 @@ public class ActivityManagerService extends IActivityManager.Stub /** Total # of UID change events dispatched, shown in dumpsys. */ int mUidChangeDispatchCount; + /** + * Uids of apps with current active camera sessions. Access synchronized on + * the IntArray instance itself, and no other locks must be acquired while that + * one is held. + */ + @GuardedBy("mActiveCameraUids") + final IntArray mActiveCameraUids = new IntArray(4); + /** * Helper class which strips out priority and proto arguments then calls the dump function with * the appropriate arguments. If priority arguments are omitted, function calls the legacy @@ -2032,7 +2042,10 @@ public class ActivityManagerService extends IActivityManager.Stub } if (proc != null) { long startTime = SystemClock.currentThreadTimeMillis(); - long pss = Debug.getPss(pid, tmp, null); + // skip background PSS calculation of apps that are capturing + // camera imagery + final boolean usingCamera = isCameraActiveForUid(proc.uid); + long pss = usingCamera ? 0 : Debug.getPss(pid, tmp, null); long endTime = SystemClock.currentThreadTimeMillis(); synchronized (ActivityManagerService.this) { if (pss != 0 && proc.thread != null && proc.setProcState == procState @@ -2045,6 +2058,7 @@ public class ActivityManagerService extends IActivityManager.Stub ProcessList.abortNextPssTime(proc.procStateMemTracker); if (DEBUG_PSS) Slog.d(TAG_PSS, "Skipped pss collection of " + pid + ": " + (proc.thread == null ? "NO_THREAD " : "") + + (usingCamera ? "CAMERA " : "") + (proc.pid != pid ? "PID_CHANGED " : "") + " initState=" + procState + " curState=" + proc.setProcState + " " + @@ -2134,6 +2148,14 @@ public class ActivityManagerService extends IActivityManager.Stub } } }); + + final int[] cameraOp = {AppOpsManager.OP_CAMERA}; + mAppOpsService.startWatchingActive(cameraOp, new IAppOpsActiveCallback.Stub() { + @Override + public void opActiveChanged(int op, int uid, String packageName, boolean active) { + cameraActiveChanged(uid, active); + } + }); } public void setWindowManager(WindowManagerService wm) { @@ -18224,6 +18246,27 @@ public class ActivityManagerService extends IActivityManager.Stub } } + final void cameraActiveChanged(@UserIdInt int uid, boolean active) { + synchronized (mActiveCameraUids) { + final int curIndex = mActiveCameraUids.indexOf(uid); + if (active) { + if (curIndex < 0) { + mActiveCameraUids.add(uid); + } + } else { + if (curIndex >= 0) { + mActiveCameraUids.remove(curIndex); + } + } + } + } + + final boolean isCameraActiveForUid(@UserIdInt int uid) { + synchronized (mActiveCameraUids) { + return mActiveCameraUids.indexOf(uid) >= 0; + } + } + @GuardedBy("this") final void doStopUidLocked(int uid, final UidRecord uidRec) { mServices.stopInBackgroundLocked(uid); -- cgit v1.2.3-59-g8ed1b From 1adf9e656032f1850a7a1d5731cc67469bc26fc9 Mon Sep 17 00:00:00 2001 From: Patrick Baumann Date: Thu, 23 Jul 2020 14:15:29 -0700 Subject: Fix unintended preferred activity reset When the preferred handler of an action is saved with "always", the set of components displayed as options to the user are saved with it. On subsequent queries, if that set of components change, the preference is cleared to allow the user to consider the new set. With the introduction of app visibility filtering in R (and to a lesser extent, Instant Apps in O), the set of apps that an app can see may be less than the set that the system can. As a result, if the caller calls resolveIntent and cannot see all of the apps the system can, it may reset the user preference unexpectedly. This change ensures that before we clear the user preference that we're comparing against the full set of apps. As such, if we encounter a call to the method from an app that cannot see all apps, we avoid any mutations and instead just return the set of apps that the user can see or the preferred app if it's part of the set they can see. If the system calls or if the call is part of an activity start, we'll allow reset of the preference. Test: Manual - Install 3 cameras, verify preference only reset on start Fixes: 157548344 Change-Id: Icb50a66500edba26c4c6c3e80a6a9c544d4d63d6 (cherry picked from commit 312755820a8d5ec76d4d0c26a36a9c354591e248) --- .../android/server/pm/PackageManagerService.java | 62 ++++++++++++++-------- 1 file changed, 41 insertions(+), 21 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index b4ab57fa4dc8..63c721a5da7b 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -6432,9 +6432,14 @@ public class PackageManagerService extends IPackageManager.Stub true /*allowDynamicSplits*/); Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); + final boolean queryMayBeFiltered = + UserHandle.getAppId(filterCallingUid) >= Process.FIRST_APPLICATION_UID + && !resolveForStart; + final ResolveInfo bestChoice = chooseBestActivity( - intent, resolvedType, flags, privateResolveFlags, query, userId); + intent, resolvedType, flags, privateResolveFlags, query, userId, + queryMayBeFiltered); final boolean nonBrowserOnly = (privateResolveFlags & PackageManagerInternal.RESOLVE_NON_BROWSER_ONLY) != 0; if (nonBrowserOnly && bestChoice != null && bestChoice.handleAllWebDataURI) { @@ -6598,7 +6603,8 @@ public class PackageManagerService extends IPackageManager.Stub } private ResolveInfo chooseBestActivity(Intent intent, String resolvedType, - int flags, int privateResolveFlags, List query, int userId) { + int flags, int privateResolveFlags, List query, int userId, + boolean queryMayBeFiltered) { if (query != null) { final int N = query.size(); if (N == 1) { @@ -6623,7 +6629,7 @@ public class PackageManagerService extends IPackageManager.Stub // If we have saved a preference for a preferred activity for // this Intent, use that. ResolveInfo ri = findPreferredActivityNotLocked(intent, resolvedType, - flags, query, r0.priority, true, false, debug, userId); + flags, query, r0.priority, true, false, debug, userId, queryMayBeFiltered); if (ri != null) { return ri; } @@ -6805,11 +6811,19 @@ public class PackageManagerService extends IPackageManager.Stub && intent.hasCategory(CATEGORY_DEFAULT); } + ResolveInfo findPreferredActivityNotLocked(Intent intent, String resolvedType, int flags, + List query, int priority, boolean always, + boolean removeMatches, boolean debug, int userId) { + return findPreferredActivityNotLocked( + intent, resolvedType, flags, query, priority, always, removeMatches, debug, userId, + UserHandle.getAppId(Binder.getCallingUid()) >= Process.FIRST_APPLICATION_UID); + } + // TODO: handle preferred activities missing while user has amnesia /** must not hold {@link #mLock} */ ResolveInfo findPreferredActivityNotLocked(Intent intent, String resolvedType, int flags, List query, int priority, boolean always, - boolean removeMatches, boolean debug, int userId) { + boolean removeMatches, boolean debug, int userId, boolean queryMayBeFiltered) { if (Thread.holdsLock(mLock)) { Slog.wtf(TAG, "Calling thread " + Thread.currentThread().getName() + " is holding mLock", new Throwable()); @@ -6903,10 +6917,12 @@ public class PackageManagerService extends IPackageManager.Stub } final boolean excludeSetupWizardHomeActivity = isHomeIntent(intent) && !isDeviceProvisioned; + final boolean allowSetMutation = !excludeSetupWizardHomeActivity + && !queryMayBeFiltered; if (ai == null) { // Do not remove launcher's preferred activity during SetupWizard // due to it may not install yet - if (excludeSetupWizardHomeActivity) { + if (!allowSetMutation) { continue; } @@ -6931,7 +6947,7 @@ public class PackageManagerService extends IPackageManager.Stub continue; } - if (removeMatches) { + if (removeMatches && allowSetMutation) { pir.removeFilter(pa); changed = true; if (DEBUG_PREFERRED) { @@ -6948,7 +6964,7 @@ public class PackageManagerService extends IPackageManager.Stub if (always && !pa.mPref.sameSet(query, excludeSetupWizardHomeActivity)) { if (pa.mPref.isSuperset(query, excludeSetupWizardHomeActivity)) { - if (!excludeSetupWizardHomeActivity) { + if (allowSetMutation) { // some components of the set are no longer present in // the query, but the preferred activity can still be reused if (DEBUG_PREFERRED) { @@ -6969,24 +6985,28 @@ public class PackageManagerService extends IPackageManager.Stub changed = true; } else { if (DEBUG_PREFERRED) { - Slog.i(TAG, "Do not remove preferred activity for launcher" - + " during SetupWizard"); + Slog.i(TAG, "Do not remove preferred activity"); } } } else { - Slog.i(TAG, - "Result set changed, dropping preferred activity for " - + intent + " type " + resolvedType); - if (DEBUG_PREFERRED) { - Slog.v(TAG, "Removing preferred activity since set changed " - + pa.mPref.mComponent); + if (allowSetMutation) { + Slog.i(TAG, + "Result set changed, dropping preferred activity " + + "for " + intent + " type " + + resolvedType); + if (DEBUG_PREFERRED) { + Slog.v(TAG, + "Removing preferred activity since set changed " + + pa.mPref.mComponent); + } + pir.removeFilter(pa); + // Re-add the filter as a "last chosen" entry (!always) + PreferredActivity lastChosen = new PreferredActivity( + pa, pa.mPref.mMatch, null, pa.mPref.mComponent, + false); + pir.addFilter(lastChosen); + changed = true; } - pir.removeFilter(pa); - // Re-add the filter as a "last chosen" entry (!always) - PreferredActivity lastChosen = new PreferredActivity( - pa, pa.mPref.mMatch, null, pa.mPref.mComponent, false); - pir.addFilter(lastChosen); - changed = true; return null; } } -- cgit v1.2.3-59-g8ed1b From a1efa34f0be55cea7c381bfbd5cc3ae6876db000 Mon Sep 17 00:00:00 2001 From: Steve Elliott Date: Wed, 22 Jul 2020 13:13:29 -0400 Subject: Ignore GONE views in shade when processing sections Fixes: 161606040 Test: atest Change-Id: I8ab108aea23ea6a139f758abdaf222f5f3641104 (cherry picked from commit dfd9f17703c9d2eee22ef8634fceb3e0b46d69fc) --- .../stack/NotificationSectionsManager.kt | 6 +- .../stack/NotificationSectionsManagerTest.java | 85 ++++++++++++---------- 2 files changed, 51 insertions(+), 40 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt index c87b9986ca55..56238d0a1b82 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt @@ -326,6 +326,7 @@ class NotificationSectionsManager @Inject internal constructor( // shade. for (i in parent.childCount - 1 downTo -1) { val child: View? = parent.getChildAt(i) + child?.let { logShadeChild(i, child) // If this child is a header, update the tracked positions @@ -339,7 +340,8 @@ class NotificationSectionsManager @Inject internal constructor( } } - val row = child as? ExpandableNotificationRow + val row = (child as? ExpandableNotificationRow) + ?.takeUnless { it.visibility == View.GONE } // Is there a section discontinuity? This usually occurs due to HUNs inIncomingSection = inIncomingSection || nextBucket?.let { next -> @@ -386,7 +388,7 @@ class NotificationSectionsManager @Inject internal constructor( // Offset the target to account for the current position of the people header. peopleState?.targetPosition = peopleState?.currentPosition?.let { current -> - peopleState?.targetPosition?.let { target -> + peopleState.targetPosition?.let { target -> if (current < target) target - 1 else target } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManagerTest.java index 243503d1d8a6..7ca24789a29b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManagerTest.java @@ -380,7 +380,7 @@ public class NotificationSectionsManagerTest extends SysuiTestCase { setupMockStack( PEOPLE_HEADER, - ALERTING.headsUp(), + ALERTING, PERSON, ALERTING_HEADER, GENTLE_HEADER, @@ -403,9 +403,9 @@ public class NotificationSectionsManagerTest extends SysuiTestCase { enablePeopleFiltering(); setupMockStack( - PERSON.headsUp(), + PERSON, INCOMING_HEADER, - ALERTING.headsUp(), + ALERTING, PEOPLE_HEADER, PERSON ); @@ -425,7 +425,7 @@ public class NotificationSectionsManagerTest extends SysuiTestCase { enablePeopleFiltering(); setupMockStack( - PERSON.headsUp(), + PERSON, PEOPLE_HEADER, PERSON ); @@ -443,8 +443,8 @@ public class NotificationSectionsManagerTest extends SysuiTestCase { enablePeopleFiltering(); setupMockStack( - ALERTING.headsUp(), - PERSON.headsUp() + ALERTING, + PERSON ); mSectionsManager.updateSectionBoundaries(); verifyMockStack( @@ -461,7 +461,7 @@ public class NotificationSectionsManagerTest extends SysuiTestCase { setupMockStack( INCOMING_HEADER, - ALERTING.headsUp(), + ALERTING, PEOPLE_HEADER, FSN, PERSON, @@ -502,9 +502,9 @@ public class NotificationSectionsManagerTest extends SysuiTestCase { public void testMediaControls_AddWhenEnterKeyguardWithHeadsUp() { enableMediaControls(); - // GIVEN a stack that doesn't include media controls but includes HEADS_UP + // GIVEN a stack that doesn't include media setupMockStack( - ALERTING.headsUp(), + ALERTING, ALERTING, GENTLE_HEADER, GENTLE); @@ -584,6 +584,27 @@ public class NotificationSectionsManagerTest extends SysuiTestCase { ); } + @Test + public void testIgnoreGoneView() { + enablePeopleFiltering(); + + setupMockStack( + PERSON.gone(), + ALERTING, + GENTLE + ); + + mSectionsManager.updateSectionBoundaries(); + + verifyMockStack( + ChildType.ALERTING_HEADER, + ChildType.PERSON, + ChildType.ALERTING, + ChildType.GENTLE_HEADER, + ChildType.GENTLE + ); + } + private void enablePeopleFiltering() { when(mSectionsFeatureManager.isFilteringEnabled()).thenReturn(true); } @@ -619,16 +640,16 @@ public class NotificationSectionsManagerTest extends SysuiTestCase { child = mSectionsManager.getSilentHeaderView(); break; case FSN: - child = mockNotification(BUCKET_FOREGROUND_SERVICE, entry.mIsHeadsUp); + child = mockNotification(BUCKET_FOREGROUND_SERVICE, entry.mIsGone); break; case PERSON: - child = mockNotification(BUCKET_PEOPLE, entry.mIsHeadsUp); + child = mockNotification(BUCKET_PEOPLE, entry.mIsGone); break; case ALERTING: - child = mockNotification(BUCKET_ALERTING, entry.mIsHeadsUp); + child = mockNotification(BUCKET_ALERTING, entry.mIsGone); break; case GENTLE: - child = mockNotification(BUCKET_SILENT, entry.mIsHeadsUp); + child = mockNotification(BUCKET_SILENT, entry.mIsGone); break; case OTHER: child = mock(View.class); @@ -643,7 +664,7 @@ public class NotificationSectionsManagerTest extends SysuiTestCase { } } - private View mockNotification(int bucket, boolean headsUp) { + private View mockNotification(int bucket, boolean isGone) { ExpandableNotificationRow notifRow = mock(ExpandableNotificationRow.class, RETURNS_DEEP_STUBS); when(notifRow.getVisibility()).thenReturn(View.VISIBLE); @@ -659,8 +680,7 @@ public class NotificationSectionsManagerTest extends SysuiTestCase { return null; }).when(mockEntry).setBucket(anyInt()); - when(notifRow.isHeadsUp()).thenReturn(headsUp); - when(mockEntry.isRowHeadsUp()).thenReturn(headsUp); + when(notifRow.getVisibility()).thenReturn(isGone ? View.GONE : View.VISIBLE); return notifRow; } @@ -767,16 +787,16 @@ public class NotificationSectionsManagerTest extends SysuiTestCase { child = mSectionsManager.getSilentHeaderView(); break; case FSN: - child = mockNotification(BUCKET_FOREGROUND_SERVICE, entry.mIsHeadsUp); + child = mockNotification(BUCKET_FOREGROUND_SERVICE, entry.mIsGone); break; case PERSON: - child = mockNotification(BUCKET_PEOPLE, entry.mIsHeadsUp); + child = mockNotification(BUCKET_PEOPLE, entry.mIsGone); break; case ALERTING: - child = mockNotification(BUCKET_ALERTING, entry.mIsHeadsUp); + child = mockNotification(BUCKET_ALERTING, entry.mIsGone); break; case GENTLE: - child = mockNotification(BUCKET_SILENT, entry.mIsHeadsUp); + child = mockNotification(BUCKET_SILENT, entry.mIsGone); break; case OTHER: child = mock(View.class); @@ -796,36 +816,25 @@ public class NotificationSectionsManagerTest extends SysuiTestCase { private static final StackEntry ALERTING_HEADER = new StackEntry(ChildType.ALERTING_HEADER); private static final StackEntry GENTLE_HEADER = new StackEntry(ChildType.GENTLE_HEADER); private static final StackEntry FSN = new StackEntry(ChildType.FSN); - private static final StackEntry.Hunnable PERSON = new StackEntry.Hunnable(ChildType.PERSON); - private static final StackEntry.Hunnable ALERTING = new StackEntry.Hunnable(ChildType.ALERTING); + private static final StackEntry PERSON = new StackEntry(ChildType.PERSON); + private static final StackEntry ALERTING = new StackEntry(ChildType.ALERTING); private static final StackEntry GENTLE = new StackEntry(ChildType.GENTLE); private static class StackEntry { final ChildType mChildType; - final boolean mIsHeadsUp; + final boolean mIsGone; StackEntry(ChildType childType) { this(childType, false); } - StackEntry(ChildType childType, boolean isHeadsUp) { + StackEntry(ChildType childType, boolean isGone) { mChildType = childType; - mIsHeadsUp = isHeadsUp; + mIsGone = isGone; } - static class Hunnable extends StackEntry { - - Hunnable(ChildType childType) { - super(childType, false); - } - - Hunnable(ChildType childType, boolean isHeadsUp) { - super(childType, isHeadsUp); - } - - public Hunnable headsUp() { - return new Hunnable(mChildType, true); - } + public StackEntry gone() { + return new StackEntry(mChildType, true); } } } -- cgit v1.2.3-59-g8ed1b From 35c84e1293868a7f15ae314c96e07319341ea599 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Fri, 24 Jul 2020 12:34:43 -0700 Subject: Allow network stack UID caller to retrieve cell identity For backwards compatibility, we allow phone, system UID to access cell identity through getServiceState. Cell broadcast service, which is used to be part of telephony, now is running under network stack UID. We should consider network stack UID as trustable components like system/telephony. Fix: 157618105 Test: Manual Change-Id: I9b2dfc778752e130f5c7e44c4b2e45b63ac6f918 (cherry picked from commit 56cfdd1e873c6c7762f9c7a3cde6a321b85c8ce8) --- telephony/common/android/telephony/LocationAccessPolicy.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/telephony/common/android/telephony/LocationAccessPolicy.java b/telephony/common/android/telephony/LocationAccessPolicy.java index 3048ad7c1fb0..1c7a700a96ef 100644 --- a/telephony/common/android/telephony/LocationAccessPolicy.java +++ b/telephony/common/android/telephony/LocationAccessPolicy.java @@ -260,11 +260,12 @@ public final class LocationAccessPolicy { /** Check if location permissions have been granted */ public static LocationPermissionResult checkLocationPermission( Context context, LocationPermissionQuery query) { - // Always allow the phone process and system server to access location. This avoid - // breaking legacy code that rely on public-facing APIs to access cell location, and - // it doesn't create an info leak risk because the cell location is stored in the phone + // Always allow the phone process, system server, and network stack to access location. + // This avoid breaking legacy code that rely on public-facing APIs to access cell location, + // and it doesn't create an info leak risk because the cell location is stored in the phone // process anyway, and the system server already has location access. if (query.callingUid == Process.PHONE_UID || query.callingUid == Process.SYSTEM_UID + || query.callingUid == Process.NETWORK_STACK_UID || query.callingUid == Process.ROOT_UID) { return LocationPermissionResult.ALLOWED; } -- cgit v1.2.3-59-g8ed1b From dc21a3c479dc91db24e9854114dfe283cbd58231 Mon Sep 17 00:00:00 2001 From: Lais Andrade Date: Thu, 23 Jul 2020 18:05:09 +0000 Subject: Propagate AudioAttributes flags to VibrationAttributes Set supported flags from AudioAttributes into VibrationAttributes on the builder constructor. Fix: b/161761418 Test: manual Change-Id: I4a8e1db278843b2f9f19aba43b0b8f264cb696bd (cherry picked from commit c2777148df6f9f9880917bd3a5284f63c6d7e58f) --- core/java/android/os/VibrationAttributes.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/java/android/os/VibrationAttributes.java b/core/java/android/os/VibrationAttributes.java index 27782fa74dab..171aef400b07 100644 --- a/core/java/android/os/VibrationAttributes.java +++ b/core/java/android/os/VibrationAttributes.java @@ -304,6 +304,7 @@ public final class VibrationAttributes implements Parcelable { @Nullable VibrationEffect effect) { mAudioAttributes = audio; setUsage(audio); + setFlags(audio); applyHapticFeedbackHeuristics(effect); } @@ -360,6 +361,12 @@ public final class VibrationAttributes implements Parcelable { } } + private void setFlags(@NonNull AudioAttributes audio) { + if ((audio.getAllFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) { + mFlags |= FLAG_BYPASS_INTERRUPTION_POLICY; + } + } + /** * Combines all of the attributes that have been set and returns a new * {@link VibrationAttributes} object. -- cgit v1.2.3-59-g8ed1b From d58101e2b2410f686b69de5d5a2dbbada198053a Mon Sep 17 00:00:00 2001 From: Zim Date: Fri, 24 Jul 2020 11:16:22 +0100 Subject: Reduce demo user FUSE volume mount timeout A long timeout seems to break demo users when calling DevicePolicyManagerService#enableSystemApp. We soft-revert Ia8f6f121448f6b5e484fd3e8cca845fdd89afc23 just for demo users while investigating the root cause. Test: Manual Bug: 161702661 Change-Id: I8ff153f2649e3a1d05f2e3e6e382bbba8c79630c (cherry picked from commit 1d6554f0e1c7882070d10a7dff6f9d6aae6fb252) --- .../com/android/server/storage/StorageUserConnection.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/storage/StorageUserConnection.java b/services/core/java/com/android/server/storage/StorageUserConnection.java index ed5706752cb2..361a5067b9bf 100644 --- a/services/core/java/com/android/server/storage/StorageUserConnection.java +++ b/services/core/java/com/android/server/storage/StorageUserConnection.java @@ -34,6 +34,7 @@ import android.os.ParcelFileDescriptor; import android.os.ParcelableException; import android.os.RemoteCallback; import android.os.UserHandle; +import android.os.UserManagerInternal; import android.os.storage.StorageManagerInternal; import android.os.storage.StorageVolume; import android.service.storage.ExternalStorageService; @@ -62,19 +63,25 @@ import java.util.concurrent.TimeoutException; public final class StorageUserConnection { private static final String TAG = "StorageUserConnection"; - public static final int REMOTE_TIMEOUT_SECONDS = 20; + private static final int DEFAULT_REMOTE_TIMEOUT_SECONDS = 20; + // TODO(b/161702661): Workaround for demo user to have shorter timeout. + // This allows the DevicePolicyManagerService#enableSystemApp call to succeed without ANR. + private static final int DEMO_USER_REMOTE_TIMEOUT_SECONDS = 5; private final Object mLock = new Object(); private final Context mContext; private final int mUserId; private final StorageSessionController mSessionController; private final ActiveConnection mActiveConnection = new ActiveConnection(); + private final boolean mIsDemoUser; @GuardedBy("mLock") private final Map mSessions = new HashMap<>(); public StorageUserConnection(Context context, int userId, StorageSessionController controller) { mContext = Objects.requireNonNull(context); mUserId = Preconditions.checkArgumentNonnegative(userId); mSessionController = controller; + mIsDemoUser = LocalServices.getService(UserManagerInternal.class) + .getUserInfo(userId).isDemo(); } /** @@ -200,7 +207,8 @@ public final class StorageUserConnection { private void waitForLatch(CountDownLatch latch, String reason) throws TimeoutException { try { - if (!latch.await(REMOTE_TIMEOUT_SECONDS, TimeUnit.SECONDS)) { + if (!latch.await(mIsDemoUser ? DEMO_USER_REMOTE_TIMEOUT_SECONDS + : DEFAULT_REMOTE_TIMEOUT_SECONDS, TimeUnit.SECONDS)) { // TODO(b/140025078): Call ActivityManager ANR API? Slog.wtf(TAG, "Failed to bind to the ExternalStorageService for user " + mUserId); throw new TimeoutException("Latch wait for " + reason + " elapsed"); -- cgit v1.2.3-59-g8ed1b From e95a490dd1fdeeb64a2e19e71f5b7685a10040be Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Tue, 28 Jul 2020 09:18:46 +0000 Subject: Set the NetworkInfo subtype to 0. For non-telephony networks, this was always set to 0 before R. In R, it is currently set to the same value as the network type. This is incorrect because the two have different namespaces. or example, currently, any network of type WIFI (==1) will have a subtype of NETWORK_TYPE_GPRS (==1). Similarly, all ETHERNET networks will have subtype NETWORK_TYPE_1XRTT, all VPN networks will have a subtype of NETWORK_TYPE_TD_SCDMA, etd. Bug: 161653721 Test: builds, boots Change-Id: I07e111c1762e0021c931cefc27f193f78578748b (cherry picked from commit a40ff70cad00a6c298e07c2c38e95d58074a7157) --- core/java/android/net/NetworkAgent.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/java/android/net/NetworkAgent.java b/core/java/android/net/NetworkAgent.java index 482d2d2192b8..327e42bdd2f7 100644 --- a/core/java/android/net/NetworkAgent.java +++ b/core/java/android/net/NetworkAgent.java @@ -354,8 +354,7 @@ public abstract class NetworkAgent { private static NetworkInfo getLegacyNetworkInfo(final NetworkAgentConfig config) { // The subtype can be changed with (TODO) setLegacySubtype, but it starts // with the type and an empty description. - final NetworkInfo ni = new NetworkInfo(config.legacyType, config.legacyType, - config.legacyTypeName, ""); + final NetworkInfo ni = new NetworkInfo(config.legacyType, 0, config.legacyTypeName, ""); ni.setIsAvailable(true); ni.setExtraInfo(config.getLegacyExtraInfo()); return ni; -- cgit v1.2.3-59-g8ed1b From 940b34d6ebd2d56f907872d25d960164f0851f89 Mon Sep 17 00:00:00 2001 From: Zim Date: Wed, 29 Jul 2020 16:49:14 +0100 Subject: Decouple FUSE mount from main thread for demo user Previously, when binding to the FUSE daemon from the system_server, we depended on the main thread to deliver the service connected message. The main thread can unfortunately be very delayed from other services running long tasks. In some cases, we might even have deadlocks of the following nature: T1: vold -> storage_manager_service # mount waiting for main thread task while holding vold lock T2 (main thread): other_service -> vold # other task blocked on vold lock while on the main thread. Now we move the bind callback to a dedicated handler thread. This allows the vold mount to complete independent of other tasks running on the system_server main thread. We also revert the temporary fix to unblock the retail demo use case that uncovered this deadlock: I8ff153f2649e3a1d05f2e3e6e382bbba8c79630c All of this only affects the demo user and is a no-op for other users Test: Manual Bug: 161702661 Bug: 162209395 Change-Id: I9b6ccff5705bb78cb1ff7a31e3dd2f26d9b400c6 (cherry picked from commit 0af8530dd302d14cccac28382a8b39886dff33bd) --- .../server/storage/StorageUserConnection.java | 48 ++++++++++++++++------ 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/services/core/java/com/android/server/storage/StorageUserConnection.java b/services/core/java/com/android/server/storage/StorageUserConnection.java index 361a5067b9bf..1c29c69239f6 100644 --- a/services/core/java/com/android/server/storage/StorageUserConnection.java +++ b/services/core/java/com/android/server/storage/StorageUserConnection.java @@ -29,6 +29,7 @@ import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; import android.os.Bundle; +import android.os.HandlerThread; import android.os.IBinder; import android.os.ParcelFileDescriptor; import android.os.ParcelableException; @@ -64,9 +65,6 @@ public final class StorageUserConnection { private static final String TAG = "StorageUserConnection"; private static final int DEFAULT_REMOTE_TIMEOUT_SECONDS = 20; - // TODO(b/161702661): Workaround for demo user to have shorter timeout. - // This allows the DevicePolicyManagerService#enableSystemApp call to succeed without ANR. - private static final int DEMO_USER_REMOTE_TIMEOUT_SECONDS = 5; private final Object mLock = new Object(); private final Context mContext; @@ -75,6 +73,7 @@ public final class StorageUserConnection { private final ActiveConnection mActiveConnection = new ActiveConnection(); private final boolean mIsDemoUser; @GuardedBy("mLock") private final Map mSessions = new HashMap<>(); + @GuardedBy("mLock") @Nullable private HandlerThread mHandlerThread; public StorageUserConnection(Context context, int userId, StorageSessionController controller) { mContext = Objects.requireNonNull(context); @@ -82,6 +81,10 @@ public final class StorageUserConnection { mSessionController = controller; mIsDemoUser = LocalServices.getService(UserManagerInternal.class) .getUserInfo(userId).isDemo(); + if (mIsDemoUser) { + mHandlerThread = new HandlerThread("StorageUserConnectionThread-" + mUserId); + mHandlerThread.start(); + } } /** @@ -188,6 +191,9 @@ public final class StorageUserConnection { */ public void close() { mActiveConnection.close(); + if (mIsDemoUser) { + mHandlerThread.quit(); + } } /** Returns all created sessions. */ @@ -207,8 +213,7 @@ public final class StorageUserConnection { private void waitForLatch(CountDownLatch latch, String reason) throws TimeoutException { try { - if (!latch.await(mIsDemoUser ? DEMO_USER_REMOTE_TIMEOUT_SECONDS - : DEFAULT_REMOTE_TIMEOUT_SECONDS, TimeUnit.SECONDS)) { + if (!latch.await(DEFAULT_REMOTE_TIMEOUT_SECONDS, TimeUnit.SECONDS)) { // TODO(b/140025078): Call ActivityManager ANR API? Slog.wtf(TAG, "Failed to bind to the ExternalStorageService for user " + mUserId); throw new TimeoutException("Latch wait for " + reason + " elapsed"); @@ -424,15 +429,32 @@ public final class StorageUserConnection { }; Slog.i(TAG, "Binding to the ExternalStorageService for user " + mUserId); - if (mContext.bindServiceAsUser(new Intent().setComponent(name), mServiceConnection, - Context.BIND_AUTO_CREATE | Context.BIND_IMPORTANT, - UserHandle.of(mUserId))) { - Slog.i(TAG, "Bound to the ExternalStorageService for user " + mUserId); - return mLatch; + if (mIsDemoUser) { + // Schedule on a worker thread for demo user to avoid deadlock + if (mContext.bindServiceAsUser(new Intent().setComponent(name), + mServiceConnection, + Context.BIND_AUTO_CREATE | Context.BIND_IMPORTANT, + mHandlerThread.getThreadHandler(), + UserHandle.of(mUserId))) { + Slog.i(TAG, "Bound to the ExternalStorageService for user " + mUserId); + return mLatch; + } else { + mIsConnecting = false; + throw new ExternalStorageServiceException( + "Failed to bind to the ExternalStorageService for user " + mUserId); + } } else { - mIsConnecting = false; - throw new ExternalStorageServiceException( - "Failed to bind to the ExternalStorageService for user " + mUserId); + if (mContext.bindServiceAsUser(new Intent().setComponent(name), + mServiceConnection, + Context.BIND_AUTO_CREATE | Context.BIND_IMPORTANT, + UserHandle.of(mUserId))) { + Slog.i(TAG, "Bound to the ExternalStorageService for user " + mUserId); + return mLatch; + } else { + mIsConnecting = false; + throw new ExternalStorageServiceException( + "Failed to bind to the ExternalStorageService for user " + mUserId); + } } } } -- cgit v1.2.3-59-g8ed1b