From f5f6bb2d888ada9b4bb3a92b106f4b1416968ea7 Mon Sep 17 00:00:00 2001 From: "Brian C. Young" Date: Fri, 30 Mar 2018 14:03:15 -0700 Subject: [PATCH] Remove getCurrentUser call to find an alternative The call the framework uses to get the current user ID requires the INTERACT_ACROSS_USERS permission, which not a lot of apps will have. Find a better way to do that. Bug: 76430246 Test: CtsKeystoreTestCases Change-Id: I8a0637d351fff9cfbf40e02946325f90466b68c5 --- keystore/java/android/security/KeyStore.java | 3 --- keystore/java/android/security/keystore/KeymasterUtils.java | 1 - 2 files changed, 4 deletions(-) diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 81644ebab6924..fe05c13c999be 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -547,9 +547,6 @@ public class KeyStore { try { args = args != null ? args : new KeymasterArguments(); entropy = entropy != null ? entropy : new byte[0]; - if (!args.containsTag(KeymasterDefs.KM_TAG_USER_ID)) { - args.addUnsignedInt(KeymasterDefs.KM_TAG_USER_ID, ActivityManager.getCurrentUser()); - } return mBinder.begin(getToken(), alias, purpose, pruneable, args, entropy, uid); } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); diff --git a/keystore/java/android/security/keystore/KeymasterUtils.java b/keystore/java/android/security/keystore/KeymasterUtils.java index 6e5012160d6e8..14a9970c66d46 100644 --- a/keystore/java/android/security/keystore/KeymasterUtils.java +++ b/keystore/java/android/security/keystore/KeymasterUtils.java @@ -101,7 +101,6 @@ public abstract class KeymasterUtils { * require user authentication. */ public static void addUserAuthArgs(KeymasterArguments args, UserAuthArgs spec) { - args.addUnsignedInt(KeymasterDefs.KM_TAG_USER_ID, ActivityManager.getCurrentUser()); if (spec.isUserConfirmationRequired()) { args.addBoolean(KeymasterDefs.KM_TAG_TRUSTED_CONFIRMATION_REQUIRED);