From 9e62f3ee110a57d23a7c0d05af29cc6621d5ee59 Mon Sep 17 00:00:00 2001 From: "Brian C. Young" Date: Wed, 10 Jan 2018 11:10:29 -0800 Subject: [PATCH] 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 --- gatekeeperd/gatekeeperd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp index 578176578..cae1e8b56 100644 --- a/gatekeeperd/gatekeeperd.cpp +++ b/gatekeeperd/gatekeeperd.cpp @@ -322,7 +322,7 @@ public: std::vector 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); }