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

Commit 9a675e7d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [3535875, 3534641, 3534642, 3536651, 3536652, 3536653,... 

Merge cherrypicks of [3535875, 3534641, 3534642, 3536651, 3536652, 3536653, 3535904, 3535498, 3536654, 3535876, 3534643, 3535905] into pi-release

Change-Id: I563058ae7a1d9bc0a9345f37059d8ac428e0abaf
parents 1b65443f 701b26ae

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, 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);

                }