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

Commit 2d35b7ef authored by Brian C. Young's avatar Brian C. Young Committed by android-build-merger
Browse files

Merge "Remove getCurrentUser call to find an alternative" into pi-dev 

am: 1b3844cb

Change-Id: Id2ae3acaf7ac7af3b5d53703f229c60dd86124ac
parents 5df6423a 1b3844cb

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