commit 8dc03f6e256b34ef08bcfce04e6be91f45e4f6d5
author Brian Young <bcyoung@google.com> Thu Feb 22 23:35:48 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Feb 23 18:03:28 2018 +0000
tree 262853ab1cf3e5f49e468b2b12077a06d311d0d4
parent 5988ea85fdce9866142c0feb31e7e2c911f759b8

Revert "Restore "Add UID parameter to authentication token""

This reverts commit 9e62f3ee110a57d23a7c0d05af29cc6621d5ee59.

Reason for revert: Regression in creating auth-bound keys

Bug: 73773914

Bug: 67752510

Change-Id: Ibde9aefffbaab9b85deb95ae2fdf9e0db6d1e992
(cherry picked from commit 388ff6bb7b1fa54c9dc20532b217cd1e0a8af4c9)

gatekeeperd/gatekeeperd.cpp

diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index cae1e8b..5781765 100644
--- a/gatekeeperd/gatekeeperd.cpp
+++ b/gatekeeperd/gatekeeperd.cpp
@@ -322,7 +322,7 @@
                 std::vector<uint8_t> auth_token_vector(*auth_token,
                                                        (*auth_token) + *auth_token_length);
                 int result = 0;
-                auto binder_result = service->addAuthToken(auth_token_vector, uid, &result);
+                auto binder_result = service->addAuthToken(auth_token_vector, &result);
                 if (!binder_result.isOk() || !keystore::KeyStoreServiceReturnCode(result).isOk()) {
                     ALOGE("Failure sending auth token to KeyStore: %" PRId32, result);
                 }