commit 2255215bda1a50b312bd1653db1e02d2a8ea1f6c
author Xin Li <delphij@google.com> Mon Mar 10 09:56:06 2025 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 10 09:56:06 2025 -0700
tree ebd2f239c2ef6ac64c0eb5beb9561729e302f5ba
parent eb9f6a41838277a7f8047c7c9e78e3609545be34
parent 9223a96261742eadbc443dc6511900d0377c63b4

Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main

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;
             }