Merge tag 'android-security-10.0.0_r53' into int/10/fp2
Android security 10.0.0 release 53
* tag 'android-security-10.0.0_r53':
KeyChain: Do not allow hiding Cert Install dialog
Change-Id: Ib0b0cc5526dfc6134e572b5f2b25d3800664f6c5
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 7d98bd5..41afc39 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -73,5 +73,5 @@
<string name="wifi_installer_fail" msgid="894483173306576331">"يتعذر تثبيت بيانات اعتماد Wi-Fi. يمكنك تجربة تنزيل الملف مرة أخرى."</string>
<string name="wifi_installer_fail_no_wifi_title" msgid="8358191074828840533">"تم إلغاء التثبيت"</string>
<string name="wifi_installer_fail_title" msgid="5547079779067835479">"يتعذر التثبيت"</string>
- <string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"شغِّل Wi-Fi وأعد المحاولة."</string>
+ <string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"فعِّل Wi-Fi وأعد المحاولة."</string>
</resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index ee63214..ab69d44 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -70,7 +70,7 @@
<string name="done_label" msgid="5597425930652904250">"EGINDA"</string>
<string name="wifi_installer_detail" msgid="63879632832701669">"Instalatu Wi-Fi kredentzialak <xliff:g id="NAME">%1$s</xliff:g> bidez erabilgarri dauden sareetara konektatzeko."</string>
<string name="wifi_installer_download_error" msgid="5429453090956277692">"Deskargatutako fitxategiak arazoak ditu eta ezin da instalatu. Ziurtatu iturburu zuzenetik deskargatu duzula fitxategia."</string>
- <string name="wifi_installer_fail" msgid="894483173306576331">"Ezin dira instalatu Wi-Fi kredentzialak. Saiatu fitxategia berriro deskargatzen."</string>
+ <string name="wifi_installer_fail" msgid="894483173306576331">"Ezin dira instalatu wifi-kredentzialak. Deskargatu fitxategia berriro."</string>
<string name="wifi_installer_fail_no_wifi_title" msgid="8358191074828840533">"Instalazioa bertan behera utzi da"</string>
<string name="wifi_installer_fail_title" msgid="5547079779067835479">"Ezin da instalatu"</string>
<string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"Aktibatu Wi-Fi konexioa eta saiatu berriro."</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 66199a2..dd1d635 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -55,7 +55,7 @@
<string name="wifi_title" msgid="8475811746333426489">"વાઇ-ફાઇ પ્રોફાઇલ"</string>
<string name="wifi_detail_title" msgid="3627332137252994395">"%s માટેની વિગતો"</string>
<string name="wifi_detail_label" msgid="3032151019356747583">"વિગતો"</string>
- <string name="wifi_install_label" msgid="1449629407724323233">"ઇન્સ્ટોલ કરો"</string>
+ <string name="wifi_install_label" msgid="1449629407724323233">"ઇન્સ્ટૉલ કરો"</string>
<string name="wifi_installing_label" msgid="8387393993627129025">"ઇન્સ્ટોલ કરી રહ્યું છે"</string>
<string name="wifi_cancel_label" msgid="1328748037608392134">"રદ કરો"</string>
<string name="wifi_dismiss_label" msgid="1916684434873972698">"કાઢી નાખો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 04d737b..28fa0a4 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -52,7 +52,7 @@
<item msgid="692322974985472861">"वाई-फ़ाई"</item>
</string-array>
<string name="certificate_capabilities_warning" msgid="4158609401937799110">"ध्यान दें: यह प्रमाणपत्र देने वाली कंपनी, आपके डिवाइस पर आ रहे और आपके डिवाइस से भेजे जा रहे नेटवर्क से जुड़े सभी ट्रैफ़िक की जाँच कर सकती है."</string>
- <string name="wifi_title" msgid="8475811746333426489">"वाई-फ़ार्इ प्रोफ़ाइल"</string>
+ <string name="wifi_title" msgid="8475811746333426489">"वाई-फ़ाई प्रोफ़ाइल"</string>
<string name="wifi_detail_title" msgid="3627332137252994395">"%s के विवरण"</string>
<string name="wifi_detail_label" msgid="3032151019356747583">"विवरण"</string>
<string name="wifi_install_label" msgid="1449629407724323233">"इंस्टॉल करें"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index e4b981a..016e7c5 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -20,9 +20,7 @@
<string name="pick_file_title" msgid="4481949485108233297">"Ընտրել վկայական"</string>
<string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Արտահանեք վկայական"</string>
<string name="extracting_pkcs12" msgid="1881267738821799771">"Արտահանվում է..."</string>
- <!-- String.format failed for translation -->
- <!-- no translation found for pkcs12_file_password_dialog_title (8102721384767269510) -->
- <skip />
+ <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Դուրսբերում %s-ից"</string>
<string name="name_credential_dialog_title" msgid="277729846491554437">"Անվանեք վկայագիրը"</string>
<string name="credential_name" msgid="1974979771369744378">"Վկայագրի անունը`"</string>
<string name="credential_password" msgid="3520176519550993326">"Մուտքագրեք գաղտնաբառը` հավաստագրերն արտածելու համար:"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 90b91a6..0a99c46 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -64,9 +64,7 @@
<string name="wifi_ttls_config_text" msgid="2002413183253872168">"მომხმარებლის სახელი: %s\n"</string>
<string name="wifi_tls_config_text" msgid="9062328536640168510">"კლიენტის სერტიფიკატი:\n%1$s\nგასაღები: %2$s\n"</string>
<string name="wifi_sim_config_text" msgid="1666019954520831840">"SIM: %s\n"</string>
- <!-- String.format failed for translation -->
- <!-- no translation found for wifi_trust_config_text (5916047381475747783) -->
- <skip />
+ <string name="wifi_trust_config_text" msgid="5916047381475747783">"სერტიფიკატის ნდობა: \n%s\n"</string>
<string name="install_done_title" msgid="4822989918460334497">"ავტორიზაციის მონაცემები დაყენებულია"</string>
<string name="install_done" msgid="1522718684172097080">"<xliff:g id="NAME">%1$s</xliff:g> ავტორიზაციის მონაცემები დაემატა შენახულ Wi-Fi ქსელებს."</string>
<string name="done_label" msgid="5597425930652904250">"შესრულდა"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 3ad758b..4b733d3 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -73,5 +73,5 @@
<string name="wifi_installer_fail" msgid="894483173306576331">"Wi-Fi эсептик дайындары орнотулбай калды. Файлды кайра жүктөп көрүңүз."</string>
<string name="wifi_installer_fail_no_wifi_title" msgid="8358191074828840533">"Орнотуу жокко чыгарылды"</string>
<string name="wifi_installer_fail_title" msgid="5547079779067835479">"Орнотулбай жатат"</string>
- <string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"Wi-Fi күйгүзүп, кайра аракет кылыңыз."</string>
+ <string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"Wi-Fi күйгүзүп, кайталап көрүңүз."</string>
</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 83064b9..07cbe4f 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -20,9 +20,7 @@
<string name="pick_file_title" msgid="4481949485108233297">"සහතිකයක් තෝරන්න"</string>
<string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"සහතිකය උද්ධෘත කරන්න"</string>
<string name="extracting_pkcs12" msgid="1881267738821799771">"උද්ධෘත කරමින්..."</string>
- <!-- String.format failed for translation -->
- <!-- no translation found for pkcs12_file_password_dialog_title (8102721384767269510) -->
- <skip />
+ <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"%s ගෙන් උද්ධෘත කරන්න"</string>
<string name="name_credential_dialog_title" msgid="277729846491554437">"සහතිකය නම් කරන්න"</string>
<string name="credential_name" msgid="1974979771369744378">"සහතිකයේ නම:"</string>
<string name="credential_password" msgid="3520176519550993326">"සහතික උද්ධෘත කිරීමට මුරපදය ටයිප් කරන්න."</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 282ccf7..a1f1caa 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -48,7 +48,7 @@
<string name="only_primary_user_allowed" msgid="4005084935023047716">"இந்தச் சாதனத்தின் உரிமையாளர் மட்டுமே சான்றிதழ்களை நிறுவலாம்."</string>
<string name="credential_usage_label" msgid="1513892208033156805">"நன்சான்றின் பயன்பாடு:"</string>
<string-array name="credential_usage">
- <item msgid="375085478373011304">"VPN மற்றும் பயன்பாடுகள்"</item>
+ <item msgid="375085478373011304">"VPN மற்றும் ஆப்ஸ்"</item>
<item msgid="692322974985472861">"வைஃபை"</item>
</string-array>
<string name="certificate_capabilities_warning" msgid="4158609401937799110">"கவனத்திற்கு: இந்தச் சான்றிதழை வழங்குபவர், சாதனத்தைப் பயன்படுத்துவதன் மூலம் கிடைக்கும் ட்ராஃபிக் அனைத்தையும் ஆய்வுசெய்யக்கூடும்."</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index 918b499..062c1ce 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -16,5 +16,7 @@
<resources>
<bool name="config_auto_cert_approval">true</bool>
+
+ <string name="config_system_install_component" translatable="false">com.android.settings/com.android.settings.security.CredentialStorage</string>
</resources>
diff --git a/src/com/android/certinstaller/CredentialHelper.java b/src/com/android/certinstaller/CredentialHelper.java
index 2091226..4ec2e7e 100644
--- a/src/com/android/certinstaller/CredentialHelper.java
+++ b/src/com/android/certinstaller/CredentialHelper.java
@@ -18,6 +18,7 @@
import android.app.KeyguardManager;
import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
@@ -277,8 +278,8 @@
Intent intent = new Intent("com.android.credentials.INSTALL");
// To prevent the private key from being sniffed, we explicitly spell
// out the intent receiver class.
- intent.setClassName(
- Util.SETTINGS_PACKAGE, "com.android.settings.security.CredentialStorage");
+ intent.setComponent(ComponentName.unflattenFromString(
+ context.getString(R.string.config_system_install_component)));
intent.putExtra(Credentials.EXTRA_INSTALL_AS_UID, mUid);
try {
if (mUserKey != null) {
diff --git a/src/com/android/certinstaller/Util.java b/src/com/android/certinstaller/Util.java
index 6178c3c..00c14c4 100644
--- a/src/com/android/certinstaller/Util.java
+++ b/src/com/android/certinstaller/Util.java
@@ -30,8 +30,6 @@
class Util {
private static final String TAG = "certinstaller.Util";
- public static final String SETTINGS_PACKAGE = "com.android.settings";
-
static byte[] toBytes(Object object) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {