Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e62f3ee authored by Brian C. Young's avatar Brian C. Young
Browse files

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 16b84349.

Test: CTS tests in I8a5affd1eaed176756175158e3057e44934fffed

Bug: 67752510

Change-Id: Ie09855813092a38fff80c913c9c8f8228aa4c95b
parent 5a33a4bf

gatekeeperd/gatekeeperd.cpp

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ public: 
                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);

                }