Import translations. DO NOT MERGE am: 1e1f4535d8 -s ours
am: 0975af3250 -s ours
Change-Id: I9d274752359ccf9345b44cf7bf3f2faf211949b0
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index b57b47f..9fdedad 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Aplikasi %s telah meminta sertifikat. Memilih sertifikat akan memungkinkan aplikasi menggunakan identitas ini dengan server untuk saat ini dan masa mendatang."</string>
<string name="requesting_server" msgid="5832565605998634370">"Aplikasi telah mengidentifikasi server yang meminta sebagai %s, namun Anda sebaiknya memberikan akses aplikasi ke sertifikat hanya jika Anda memercayai aplikasi tersebut."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Anda dapat memasang sertifikat dari file PKCS#12 dengan ekstensi %1$s atau %2$s yang terletak di penyimpanan eksternal."</string>
- <string name="install_new_cert_button_label" msgid="903474285774077171">"Pasang sertifikat"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Instal sertifikat"</string>
<string name="allow_button" msgid="3030990695030371561">"Pilih"</string>
<string name="deny_button" msgid="3766539809121892584">"Tolak"</string>
</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index ddf555a..e0eb18b 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -24,5 +24,5 @@
<string name="install_new_cert_message" msgid="4451971501142085495">"ಬಾಹ್ಯ ಸಂಗ್ರಹಣೆಯಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ %1$s ಅಥವಾ %2$s ವಿಸ್ತರಣೆಯೊಂದಿಗೆ PKCS#12 ಫೈಲ್ನಿಂದ ನೀವು ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ಥಾಪಿಸಬಹುದು."</string>
<string name="install_new_cert_button_label" msgid="903474285774077171">"ಪ್ರಮಾಣಪತ್ರವನ್ನು ಸ್ಥಾಪಿಸು"</string>
<string name="allow_button" msgid="3030990695030371561">"ಆಯ್ಕೆಮಾಡಿ"</string>
- <string name="deny_button" msgid="3766539809121892584">"ನಿರಾಕರಿಸು"</string>
+ <string name="deny_button" msgid="3766539809121892584">"ನಿರಾಕರಿಸಿ"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 610b804..42ed37f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -20,8 +20,8 @@
<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="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="903474285774077171">"安裝憑證"</string>
<string name="allow_button" msgid="3030990695030371561">"選取"</string>
<string name="deny_button" msgid="3766539809121892584">"拒絕"</string>
diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index afdf272..f45a1e6 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -101,18 +101,7 @@
final String keystoreAlias = Credentials.USER_PRIVATE_KEY + alias;
final int uid = Binder.getCallingUid();
- 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(systemUidForUser);
- sb.append('_');
- sb.append(keystoreAlias);
-
- return sb.toString();
+ return mKeyStore.grant(keystoreAlias, uid);
}
@Override public byte[] getCertificate(String alias) {