commit ccb492da4478a11210b1a7aa885ad38958ca837f
author Brian Young <bcyoung@google.com> Thu Feb 22 23:36:01 2018 +0000
committer Brian Young <bcyoung@google.com> Fri Feb 23 01:31:22 2018 +0000
tree 5677e5b0fa9c8152481252beb2b226e2cb0e3364
parent 05900c1ad8bb08646bdcbb68a90904b86ebf1c45

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

This reverts commit 05900c1ad8bb08646bdcbb68a90904b86ebf1c45.

Reason for revert: Regression in creating auth-bound keys

Bug: 73773914

Bug: 67752510

Change-Id: I2b247ec871d2a0a2adb9100559e4c821aeba265d

keystore/key_store_service.h

diff --git a/keystore/key_store_service.h b/keystore/key_store_service.h
index b238dc4..ce809f8 100644
--- a/keystore/key_store_service.h
+++ b/keystore/key_store_service.h
@@ -145,7 +145,7 @@
                                     int32_t* _aidl_return) override;
     ::android::binder::Status isOperationAuthorized(const ::android::sp<::android::IBinder>& token,
                                                     bool* _aidl_return) override;
-    ::android::binder::Status addAuthToken(const ::std::vector<uint8_t>& authToken, int32_t userId,
+    ::android::binder::Status addAuthToken(const ::std::vector<uint8_t>& authToken,
                                            int32_t* _aidl_return) override;
     ::android::binder::Status onUserAdded(int32_t userId, int32_t parentId,
                                           int32_t* _aidl_return) override;