Revert "Add "Unlocked device required" parameter to keys"

This reverts commit 55fff3a89d.

Reason for revert: Build breakages on elfin, gce_x86_phone.

Bug: 67752510

Bug: 72679761
Change-Id: Ia495e9cb158b64fcf015e37b170554a7ed6810a7
This commit is contained in:
Brian Young
2018-01-29 23:56:59 +00:00
committed by Ian Pedowitz
parent 55fff3a89d
commit 3a28570b28
13 changed files with 64 additions and 180 deletions

View File

@@ -618,9 +618,9 @@ public class KeyStore {
* @return {@code KeyStore.NO_ERROR} on success, otherwise an error value corresponding to
* a {@code KeymasterDefs.KM_ERROR_} value or {@code KeyStore} ResponseCode.
*/
public int addAuthToken(byte[] authToken, int userId) {
public int addAuthToken(byte[] authToken) {
try {
return mBinder.addAuthToken(authToken, userId);
return mBinder.addAuthToken(authToken);
} catch (RemoteException e) {
Log.w(TAG, "Cannot connect to keystore", e);
return SYSTEM_ERROR;