commit 1b75929a58c32882d21d04ee1df2a60a199923bd
author Brian Young <bcyoung@google.com> Mon Jan 29 23:57:29 2018 +0000
committer Ian Pedowitz <ijpedowitz@google.com> Tue Jan 30 15:31:47 2018 +0000
tree 0e89a1c62d4735d03c16d7895c0bf798a3f56e74
parent 5407bf1ece35ebc66c8c56e36a789b6fb89659d5

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

This reverts commit 5407bf1ece35ebc66c8c56e36a789b6fb89659d5.

Reason for revert: Build breakages on elfin, gce_x86_phone.

Bug: 72679761
Bug: 67752510
Change-Id: I1a4f8f725fe3aa7195f266ed77bbb7f4cccaa662

keystore/key_store_service.h

diff --git a/keystore/key_store_service.h b/keystore/key_store_service.h
index ea4a089..ce809f8 100644
--- a/keystore/key_store_service.h
+++ b/keystore/key_store_service.h
@@ -146,7 +146,7 @@
     ::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 android_uid, int32_t* _aidl_return) override;
+                                           int32_t* _aidl_return) override;
     ::android::binder::Status onUserAdded(int32_t userId, int32_t parentId,
                                           int32_t* _aidl_return) override;
     ::android::binder::Status onUserRemoved(int32_t userId, int32_t* _aidl_return) override;