Restore "Add UID parameter to authentication token"
The keystore/keymaster changes to prevent some keys from being used
while the screen is locked require passing Android user IDs as well as
keymaster secure IDs.
This reverts commit 16b84349358f8b41f5b44f439b042ac68d68d254.
Test: CTS tests in I8a5affd1eaed176756175158e3057e44934fffed
Bug: 67752510
Change-Id: Ie09855813092a38fff80c913c9c8f8228aa4c95b
diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index 5781765..cae1e8b 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, &result);
+ auto binder_result = service->addAuthToken(auth_token_vector, uid, &result);
if (!binder_result.isOk() || !keystore::KeyStoreServiceReturnCode(result).isOk()) {
ALOGE("Failure sending auth token to KeyStore: %" PRId32, result);
}