commit 22e4de516287f3bb80fc6bcc446d1a495fad0bc7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 27 08:12:39 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 27 08:12:39 2024 +0000
tree 2015241c078e1ad72a86f7e627a636b781dfa7cd
parent 478ba406f0e038089774ab66824e9ef7d052b65b
parent 8e6fb94c765de4a97e8960c43083ea82b8d6ac2a

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 96ba8017b0 -s ours am: 8e6fb94c76 -s ours

am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3378350

Change-Id: Ib8212f6f3882da4c5fb964af5b31ebaf34570e76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

res/values-af/strings.xml

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 673739d..fe50c19 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="170210454004696382">"Sleutelketting"</string>
     <string name="title_select_cert" msgid="3588447616418041699">"Kies \'n sertifikaat"</string>
-    <string name="requesting_application" msgid="1589142627467598421">"Die %s-app het \'n sertifikaat versoek. Die kies van \'n sertifikaat sal die app toelaat om hierdie identiteit nou en in die toekoms by bedieners te gebruik."</string>
-    <string name="requesting_server" msgid="5832565605998634370">"Die app het die versoekende bediener as %s geïdentifiseer, maar jy moet slegs vir die app toegang tot die sertifikaat gee as jy die app vertrou."</string>
+    <string name="requesting_application" msgid="1589142627467598421">"Die %s-program het \'n sertifikaat versoek. Die kies van \'n sertifikaat sal dat die program hierdie identiteit nou en in die toekoms by bedieners gaan gebruik."</string>
+    <string name="requesting_server" msgid="5832565605998634370">"Die program het die versoekende bediener as %s geïdentifiseer, maar jy moet slegs vir die program toegang tot die sertifikaat gee as jy die program vertrou."</string>
     <string name="install_new_cert_message" msgid="4451971501142085495">"Jy kan sertifikate installeer van \'n PKCS#12-lêer met \'n %1$s- of \'n %2$s-uitbreiding wat in eksterne berging geleë is."</string>
     <string name="allow_button" msgid="3030990695030371561">"Kies"</string>
     <string name="deny_button" msgid="3766539809121892584">"Weier"</string>

src/com/android/keychain/KeyChainService.java

diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index 18f6b45..699f507 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -37,6 +37,7 @@
 import android.os.Binder;
 import android.os.Build;
 import android.os.IBinder;
+import android.os.UserManager;
 import android.os.Process;
 import android.os.UserHandle;
 import android.security.AppUriAuthenticationPolicy;
@@ -533,11 +534,10 @@
                 return false;
             }
 
-            if (uid == Process.WIFI_UID && UserHandle.myUserId() != UserHandle.USER_SYSTEM) {
-                Log.e(TAG, String.format(
-                        "Installation into the WiFi Keystore should be called from the primary "
-                                + "user, not user %d",
-                        UserHandle.myUserId()));
+            UserManager userManager = mContext.getSystemService(UserManager.class);
+            if (uid == Process.WIFI_UID && !userManager.isAdminUser()) {
+                Log.e(TAG,
+                    "Installation into the WiFi Keystore should be called from the admin user");
                 return false;
             }