Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5f6bb2d authored by Brian C. Young's avatar Brian C. Young Committed by Brian Young
Browse files

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
parent 77fcc0da

keystore/java/android/security/KeyStore.java

+0 −3
Original line number Diff line number Diff line
@@ -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);

keystore/java/android/security/keystore/KeymasterUtils.java

+0 −1
Original line number Diff line number Diff line
@@ -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);