Merge "Revert "Implement IKeychainService.installkeyPair.""
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
deleted file mode 100644
index b442c7e..0000000
--- a/res/values-az/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="170210454004696382">"Key Chain"</string>
- <string name="title_no_certs" msgid="8350009443064722873">"Heç bir sertifikat tapılmadı"</string>
- <string name="title_select_cert" msgid="3588447616418041699">"Sertifikatı Seçin"</string>
- <string name="requesting_application" msgid="1589142627467598421">"%s sertifikat tələb edir. Sertifikatın seçilməsi tətbiqə bu identifikasiyanı indi və gələcəkdə serverlərlə istifadə etməyə imkan verəcək."</string>
- <string name="requesting_server" msgid="5832565605998634370">"Tətbiq tələb edən serveri %s olaraq tanıdı, lakin siz etibar etdiyiniz tətbiqlərə giriş verməlisiniz."</string>
- <string name="install_new_cert_message" msgid="4451971501142085495">"Siz sertifikatları xarici yaddaşda yerləşən, %1$s və ya %2$s artırması olan PKCS#12 fayldan quraşdıra bilərsiniz."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Quraşdır"</string>
- <string name="allow_button" msgid="5340501035618157678">"Icazə verin"</string>
- <string name="deny_button" msgid="3766539809121892584">"İmtina et"</string>
-</resources>
diff --git a/res/values-bn-rWB/strings.xml b/res/values-bn-rWB/strings.xml
deleted file mode 100644
index d348297..0000000
--- a/res/values-bn-rWB/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="170210454004696382">"Key Chain"</string>
- <string name="title_no_certs" msgid="8350009443064722873">"কোনো সার্টিফিকেট পাওয়া যায়নি"</string>
- <string name="title_select_cert" msgid="3588447616418041699">"সার্টিফিকেট চয়ন করুন"</string>
- <string name="requesting_application" msgid="1589142627467598421">"অ্যাপ্লিকেশান %s একটি সার্টিফিকেটের অনুরোধ করেছে। একটি সার্টিফিকেট চয়ন করলে তা অ্যাপ্লিকেশানটিকে এখন এবং ভবিষ্যতে সার্ভারগুলির সঙ্গে এই পরিচয় ব্যবহার করতে দেবে।"</string>
- <string name="requesting_server" msgid="5832565605998634370">"অ্যাপ্লিকেশানটি অনুরোধ করা সার্ভারকে %s হিসেবে শনাক্ত করেছে, আপনার কাছে অ্যাপ্লিকেশানটি বিশ্বস্ত হলে তবেই আপনি অ্যাপ্লিকেশানটিকে সার্টিফিকেট অ্যাক্সেস দিতে পারবেন।"</string>
- <string name="install_new_cert_message" msgid="4451971501142085495">"বহিরাগত সঞ্চয়স্থানে অবস্থিত %1$s বা %2$s এক্সটেনশান সহ PKCS#12 ফাইল থেকে আপনি আপনার সার্টিফিকেটগুলি ইনস্টল করতে পারেন।"</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ইনস্টল করুন"</string>
- <string name="allow_button" msgid="5340501035618157678">"অনুমতি দিন"</string>
- <string name="deny_button" msgid="3766539809121892584">"আস্বীকার করুন"</string>
-</resources>
diff --git a/res/values-eu-rPV/strings.xml b/res/values-eu-rPV/strings.xml
deleted file mode 100644
index 4e39353..0000000
--- a/res/values-eu-rPV/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="170210454004696382">"Gako-katea"</string>
- <string name="title_no_certs" msgid="8350009443064722873">"Ez da ziurtagiririk aurkitu"</string>
- <string name="title_select_cert" msgid="3588447616418041699">"Aukeratu ziurtagiria"</string>
- <string name="requesting_application" msgid="1589142627467598421">"%s aplikazioak ziurtagiri bat eskatu du. Ziurtagiri bat aukeratzen baduzu, aplikazioak identitate hori erabiliko du zerbitzarietan hemendik aurrera."</string>
- <string name="requesting_server" msgid="5832565605998634370">"Aplikazioak %s gisa identifikatu du zerbitzari eskatzailea, baina ez diozu aplikazioari ziurtagirirako sarbidea eman behar fidagarritzat jotzen ez baduzu."</string>
- <string name="install_new_cert_message" msgid="4451971501142085495">"Ziurtagiriak kanpoko memorian daukazun eta %1$s edo %2$s luzapena duen PKCS#12 fitxategi batetik instala ditzakezu."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Instalatu"</string>
- <string name="allow_button" msgid="5340501035618157678">"Baimendu"</string>
- <string name="deny_button" msgid="3766539809121892584">"Ukatu"</string>
-</resources>
diff --git a/res/values-gl-rGA/strings.xml b/res/values-gl-rGA/strings.xml
deleted file mode 100644
index 3a8ba4d..0000000
--- a/res/values-gl-rGA/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="170210454004696382">"KeyChain"</string>
- <string name="title_no_certs" msgid="8350009443064722873">"Non se atopou ningún certificado"</string>
- <string name="title_select_cert" msgid="3588447616418041699">"Seleccionar certificado"</string>
- <string name="requesting_application" msgid="1589142627467598421">"A aplicación %s solicitou un certificado. Ao escoller un certificado, a aplicación poderá utilizar esta identidade cos servidores agora e no futuro."</string>
- <string name="requesting_server" msgid="5832565605998634370">"A aplicación identificou o servidor que realiza a solicitude como %s, pero só debes concederlle acceso á aplicación ao certificado se confías nela."</string>
- <string name="install_new_cert_message" msgid="4451971501142085495">"Podes instalar certificados dun ficheiro PKCS#12 cunha extensión %1$s ou %2$s situado no almacenamento externo."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Instalar"</string>
- <string name="allow_button" msgid="5340501035618157678">"Permitir"</string>
- <string name="deny_button" msgid="3766539809121892584">"Rexeitar"</string>
-</resources>
diff --git a/res/values-kn-rKA/strings.xml b/res/values-kn-rKA/strings.xml
deleted file mode 100644
index 8e1fbf7..0000000
--- a/res/values-kn-rKA/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="170210454004696382">"ಕೀ ಚೈನ್"</string>
- <string name="title_no_certs" msgid="8350009443064722873">"ಯಾವುದೇ ಪ್ರಮಾಣಪತ್ರಗಳು ಕಂಡುಬಂದಿಲ್ಲ"</string>
- <string name="title_select_cert" msgid="3588447616418041699">"ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
- <string name="requesting_application" msgid="1589142627467598421">"ಅಪ್ಲಿಕೇಶನ್ %s ಪ್ರಮಾಣಪತ್ರವೊಂದನ್ನು ವಿನಂತಿಸಿದೆ. ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡುವುದರಿಂದ ಸರ್ವರ್ಗಳೊಂದಿಗೆ ಈಗ ಮತ್ತು ಭವಿಷ್ಯದಲ್ಲಿ ಈ ಗುರುತನ್ನು ಬಳಸಲು ಈ ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
- <string name="requesting_server" msgid="5832565605998634370">"ಅಪ್ಲಿಕೇಶನ್ ವಿನಂತಿಸಿದ ಸರ್ವರ್ ಅನ್ನು %s ರಂತೆ ಗುರುತಿಸಿದೆ, ಆದರೆ ನೀವು ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಂಬಿದರೆ ಮಾತ್ರ ಪ್ರಮಾಣಪತ್ರಕ್ಕೆ ಅಪ್ಲಿಕೇಶನ್ ಪ್ರವೇಶವನ್ನು ನೀಡಬೇಕು."</string>
- <string name="install_new_cert_message" msgid="4451971501142085495">"ಬಾಹ್ಯ ಸಂಗ್ರಹಣೆಯಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ %1$s ಅಥವಾ %2$s ವಿಸ್ತರಣೆಯೊಂದಿಗೆ PKCS#12 ಫೈಲ್ನಿಂದ ನೀವು ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ಥಾಪಿಸಬಹುದು."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ಸ್ಥಾಪಿಸು"</string>
- <string name="allow_button" msgid="5340501035618157678">"ಅನುಮತಿಸು"</string>
- <string name="deny_button" msgid="3766539809121892584">"ನಿರಾಕರಿಸು"</string>
-</resources>
diff --git a/res/values-ml-rKL/strings.xml b/res/values-ml-rKL/strings.xml
deleted file mode 100644
index 63f239f..0000000
--- a/res/values-ml-rKL/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="170210454004696382">"കീചെയിൻ"</string>
- <string name="title_no_certs" msgid="8350009443064722873">"സർട്ടിഫിക്കറ്റുകളൊന്നും കണ്ടെത്തിയില്ല"</string>
- <string name="title_select_cert" msgid="3588447616418041699">"സർട്ടിഫിക്കറ്റ് തിരഞ്ഞെടുക്കുക"</string>
- <string name="requesting_application" msgid="1589142627467598421">"%s അപ്ലിക്കേഷൻ ഒരു സർട്ടിഫിക്കറ്റ് അഭ്യർത്ഥിച്ചു. ഒരു സർട്ടിഫിക്കറ്റ് തിരഞ്ഞെടുക്കുന്നത്, സെർവറുകളിൽ ഇപ്പോഴും പിന്നീടും അപ്ലിക്കേഷൻ ഈ ഐഡന്റിറ്റി ഉപയോഗിക്കാൻ അനുവദിക്കുന്നതിനിടയാക്കും."</string>
- <string name="requesting_server" msgid="5832565605998634370">"അഭ്യർത്ഥിച്ച സെർവറായി %s എന്നതിനെ അപ്ലിക്കേഷൻ തിരിച്ചറിഞ്ഞു, പക്ഷേ നിങ്ങൾ അപ്ലിക്കേഷനെ വിശ്വസിക്കുന്നുവെങ്കിൽ മാത്രമേ സർട്ടിഫിക്കറ്റിലേക്ക് അപ്ലിക്കേഷന് ആക്സസ്സ് നൽകാവൂ."</string>
- <string name="install_new_cert_message" msgid="4451971501142085495">"ബാഹ്യസംഭരണത്തിലുള്ള %1$s അല്ലെങ്കിൽ %2$s എക്സ്റ്റൻഷൻ ഉപയോഗിച്ച് നിങ്ങൾക്ക് ഒരു PKCS#12 ഫയലിൽ സർട്ടിഫിക്കറ്റുകൾ ഇൻസ്റ്റാളുചെയ്യാനാകും."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ഇൻസ്റ്റാളുചെയ്യുക"</string>
- <string name="allow_button" msgid="5340501035618157678">"അനുവദിക്കുക"</string>
- <string name="deny_button" msgid="3766539809121892584">"നിരസിക്കുക"</string>
-</resources>
diff --git a/res/values-mr-rMH/strings.xml b/res/values-mr-rMH/strings.xml
deleted file mode 100644
index 2d6bfad..0000000
--- a/res/values-mr-rMH/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="170210454004696382">"कि चेन"</string>
- <string name="title_no_certs" msgid="8350009443064722873">"कोणतीही प्रमाणपत्रे आढळली नाहीत"</string>
- <string name="title_select_cert" msgid="3588447616418041699">"प्रमाणपत्र निवडा"</string>
- <string name="requesting_application" msgid="1589142627467598421">"%s अॅप एका प्रमाणपत्राची विनंती करत आहे. एक प्रमाणपत्र निवडणे या अॅपला या सर्व्हरसह आता आणि भविष्यात ही ओळख वापरू देईल."</string>
- <string name="requesting_server" msgid="5832565605998634370">"अॅपने विनंती केलेल्या सर्व्हरला %s म्हणून ओळखले आहे, परंतु आपला अॅपवर विश्वास असल्यास आपण अॅपला केवळ प्रमाणपत्रामध्ये प्रवेश द्यावा."</string>
- <string name="install_new_cert_message" msgid="4451971501142085495">"आपण अतिरिक्त संचयनामध्ये स्थित %1$s किंवा %2$s विस्तारासह एका PKCS#12 फाईलवरुन प्रमाणपत्र स्थापित करु शकता."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"स्थापित करा"</string>
- <string name="allow_button" msgid="5340501035618157678">"अनुमती द्या"</string>
- <string name="deny_button" msgid="3766539809121892584">"नकार द्या"</string>
-</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
deleted file mode 100644
index 40f4311..0000000
--- a/res/values-ne/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="170210454004696382">"कि चेन"</string>
- <string name="title_no_certs" msgid="8350009443064722873">"कुनै प्रमाणपत्रहरू पाइएनन्"</string>
- <string name="title_select_cert" msgid="3588447616418041699">"प्रमाणपत्र छान्नुहोस्"</string>
- <string name="requesting_application" msgid="1589142627467598421">"अनुप्रयोग %s ले एक प्रमाणपत्र अनुरोध गरेको छ। प्रमाणपत्र रोज्नाले अनुप्रयोगलाई यस पहिचान सर्भरका साथ अहिले र भविष्यमा प्रयोग गर्न मद्दत पुर्याउँछ।"</string>
- <string name="requesting_server" msgid="5832565605998634370">"अनुप्रयोगले %s को अनुरोध सर्भरलाई चिन्यो तर यदि तपाईँ अनुप्रयोगलाई विश्वास गर्नुहुन्छ भने तपाईँ प्रमाणपत्रलाई मात्र अनुप्रयोग पहुँच दिन सक्नु हुन्छ।"</string>
- <string name="install_new_cert_message" msgid="4451971501142085495">"तपाइँले प्रमाणपत्रहरू बाह्य भण्डारणमा अवस्थित %1$s वा एक %2$s विस्तारका साथ PKCS#12 फाइलबाट स्थापना गर्न सक्नुहुन्छ।"</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"स्थापना गर्नुहोस्"</string>
- <string name="allow_button" msgid="5340501035618157678">"अनुमति दिनुहोस्"</string>
- <string name="deny_button" msgid="3766539809121892584">"अस्वीकार गर्नुहोस्"</string>
-</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
deleted file mode 100644
index d2638c2..0000000
--- a/res/values-si/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="170210454004696382">"යතුරු දම්වැල"</string>
- <string name="title_no_certs" msgid="8350009443064722873">"සහතික හමුවී නැත"</string>
- <string name="title_select_cert" msgid="3588447616418041699">"සහතිකය තෝරන්න"</string>
- <string name="requesting_application" msgid="1589142627467598421">"%s යෙදුම සහතිකයක් අයැදුම් කර ඇත. සහතික පත්රයක් තෝරාගැනීමෙන් යෙදුමට එම අනන්යයතාවය සේවාදායක සමඟ දැන් සහ අනාගතයේ භාවිතා කිරීමට ඉඩ දෙනු ඇත."</string>
- <string name="requesting_server" msgid="5832565605998634370">"යෙදුම ඉල්ලීම් කරන සේවාදායකය %s ලෙස හඳුනාගෙන ඇත, එහෙත් ඔබ යෙදුමට සහතිකය සඳහා ප්රවේශය ලබා දිය යුත්තේ ඔබ යෙදුම විශ්වාස කරන්නේ නම් පමණි."</string>
- <string name="install_new_cert_message" msgid="4451971501142085495">"ඔබට බාහිර ආචයනයේ පිහිටුවා ඇති %1$s හෝ %2$s දිගුවක් සහිත PKCS#12 ගොනුවකින් සහතික ස්ථාපනය කළ හැක."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ස්ථාපනය"</string>
- <string name="allow_button" msgid="5340501035618157678">"අවසර දෙන්න"</string>
- <string name="deny_button" msgid="3766539809121892584">"තහනම්"</string>
-</resources>
diff --git a/res/values-ta-rTN/strings.xml b/res/values-ta-rTN/strings.xml
deleted file mode 100644
index f0f70eb..0000000
--- a/res/values-ta-rTN/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="170210454004696382">"கீ செயின்"</string>
- <string name="title_no_certs" msgid="8350009443064722873">"சான்றிதழ்கள் இல்லை"</string>
- <string name="title_select_cert" msgid="3588447616418041699">"சான்றிதழைத் தேர்வுசெய்க"</string>
- <string name="requesting_application" msgid="1589142627467598421">"%s பயன்பாடானது சான்றிதழைக் கோரியுள்ளது. சான்றிதழைத் தேர்வுசெய்வது, பயன்பாடு இந்த அடையாளத்தைச் சேவையகங்களுடன் இப்போதும், எதிர்காலத்திலும் பயன்படுத்த அனுமதிக்கும்."</string>
- <string name="requesting_server" msgid="5832565605998634370">"பயன்பாடானது, கோரப்படும் சேவையகத்தை %s ஆக அடையாளம் கண்டுள்ளது, நீங்கள் பயன்பாட்டை நம்பினால் மட்டுமே, பயன்பாட்டிற்குச் சான்றிதழ் அணுகலை வழங்கவும்."</string>
- <string name="install_new_cert_message" msgid="4451971501142085495">"வெளிப்புறச் சேமிப்பிடத்தில் உள்ள %1$s அல்லது %2$s நீட்டிப்புடன் PKCS#12 கோப்பிலிருந்து நீங்கள் சான்றிதழ்களை நிறுவலாம்."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"நிறுவு"</string>
- <string name="allow_button" msgid="5340501035618157678">"அனுமதி"</string>
- <string name="deny_button" msgid="3766539809121892584">"நிராகரி"</string>
-</resources>
diff --git a/res/values-te-rAP/strings.xml b/res/values-te-rAP/strings.xml
deleted file mode 100644
index 4c26b32..0000000
--- a/res/values-te-rAP/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="170210454004696382">"కీ చెయిన్"</string>
- <string name="title_no_certs" msgid="8350009443064722873">"ప్రమాణపత్రాలు కనుగొనబడలేదు"</string>
- <string name="title_select_cert" msgid="3588447616418041699">"ప్రమాణపత్రాన్ని ఎంచుకోండి"</string>
- <string name="requesting_application" msgid="1589142627467598421">"అనువర్తనం %s ప్రమాణపత్రాన్ని అభ్యర్థించింది. ప్రమాణపత్రాన్ని ఎంచుకోవడం వలన ఇప్పుడు మరియు భవిష్యత్తులో సర్వర్లతో ఈ గుర్తింపును ఉపయోగించడానికి అనువర్తనం అనుమతించబడుతుంది."</string>
- <string name="requesting_server" msgid="5832565605998634370">"అనువర్తనం అభ్యర్థిస్తున్న సర్వర్ను %sగా గుర్తించింది, కానీ మీరు అనువర్తనాన్ని విశ్వసిస్తే మాత్రమే ప్రమాణపత్రం కోసం అనువర్తనానికి ప్రాప్యతను అందించాలి."</string>
- <string name="install_new_cert_message" msgid="4451971501142085495">"మీరు బాహ్య నిల్వలో ఉండే %1$s లేదా %2$s పొడిగింపుతో PKCS#12 ఫైల్ నుండి ప్రమాణపత్రాలను ఇన్స్టాల్ చేయవచ్చు."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ఇన్స్టాల్ చేయి"</string>
- <string name="allow_button" msgid="5340501035618157678">"అనుమతించు"</string>
- <string name="deny_button" msgid="3766539809121892584">"తిరస్కరించు"</string>
-</resources>
diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index 822ae1a..3859f05 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -64,7 +64,7 @@
private PendingIntent mSender;
- private static enum State { INITIAL, UNLOCK_REQUESTED };
+ private static enum State { INITIAL, UNLOCK_REQUESTED, UNLOCK_CANCELED };
private State mState;
@@ -124,6 +124,11 @@
// we've already asked, but have not heard back, probably just rotated.
// wait to hear back via onActivityResult
return;
+ case UNLOCK_CANCELED:
+ // User wanted to cancel the request, so exit.
+ mState = State.INITIAL;
+ finish();
+ return;
default:
throw new AssertionError();
}
@@ -356,12 +361,12 @@
@Override protected void onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) {
case REQUEST_UNLOCK:
- mState = State.INITIAL;
if (mKeyStore.isUnlocked()) {
+ mState = State.INITIAL;
showCertChooserDialog();
} else {
// user must have canceled unlock, give up
- finish(null);
+ mState = State.UNLOCK_CANCELED;
}
return;
default:
diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index 2564d03..6e77357 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -28,6 +28,7 @@
import android.os.Binder;
import android.os.IBinder;
import android.os.Process;
+import android.os.UserHandle;
import android.os.UserManager;
import android.security.Credentials;
import android.security.IKeyChainService;
@@ -94,9 +95,11 @@
if (!mKeyStore.grant(keystoreAlias, uid)) {
return null;
}
+ final int userHandle = UserHandle.getUserId(uid);
+ final int systemUidForUser = UserHandle.getUid(userHandle, Process.SYSTEM_UID);
final StringBuilder sb = new StringBuilder();
- sb.append(Process.SYSTEM_UID);
+ sb.append(systemUidForUser);
sb.append('_');
sb.append(keystoreAlias);