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

Commit f267dbca authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use correct call to get the user ID"

parents 3086961c e9ef15d1

keystore/java/android/security/KeyStore.java

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.security;



import android.app.ActivityManager;

import android.app.ActivityThread;

import android.app.Application;

import android.app.KeyguardManager;
@@ -547,7 +548,7 @@ public class KeyStore { 
            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, UserHandle.getCallingUserId());

                args.addUnsignedInt(KeymasterDefs.KM_TAG_USER_ID, ActivityManager.getCurrentUser());

            }

            return mBinder.begin(getToken(), alias, purpose, pruneable, args, entropy, uid);

        } catch (RemoteException e) {

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

+2 −3
Original line number Diff line number Diff line
@@ -16,9 +16,8 @@ 


package android.security.keystore;



import android.util.Log;

import android.app.ActivityManager;

import android.hardware.fingerprint.FingerprintManager;

import android.os.UserHandle;

import android.security.GateKeeper;

import android.security.KeyStore;

import android.security.keymaster.KeymasterArguments;
@@ -102,7 +101,7 @@ public abstract class KeymasterUtils { 
     *         require user authentication.

     */

    public static void addUserAuthArgs(KeymasterArguments args, UserAuthArgs spec) {

        args.addUnsignedInt(KeymasterDefs.KM_TAG_USER_ID, UserHandle.getCallingUserId());

        args.addUnsignedInt(KeymasterDefs.KM_TAG_USER_ID, ActivityManager.getCurrentUser());



        if (spec.isUserConfirmationRequired()) {

            args.addBoolean(KeymasterDefs.KM_TAG_TRUSTED_CONFIRMATION_REQUIRED);