Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove getCurrentUser call to find an alternative"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-30 23:02:25 +00:00
committed by Android (Google) Code Review
parent 6ab64068cf 48000f665e
commit 0b714cce56
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
keystore/java/android/security/KeyStore.java
View File

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

1
keystore/java/android/security/keystore/KeymasterUtils.java
View File

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