| commit | 7fda18011c59819080801b41f4d98dc9e77219d4 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Feb 18 00:08:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 18 00:08:32 2021 +0000 |
| tree | 9038d755eb30ca89ae900124c66a13e11c0cab77 | |
| parent | c6c23042702953fcdee0b5c028fbc7d57ca48653 [diff] | |
| parent | 693ee75fde620c3ac2228768af6abe9d1152823f [diff] |
Merge "Gatekeeper: Add missing user_id." am: 5edcb8a3d6 am: 693ee75fde Original change: https://android-review.googlesource.com/c/platform/system/core/+/1586506 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6462d9dcf0cfdbe7af7b91d18c5293e4c87f57c1
diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp index 781b4af..f9c0cdd 100644 --- a/gatekeeperd/gatekeeperd.cpp +++ b/gatekeeperd/gatekeeperd.cpp
@@ -318,6 +318,7 @@ authToken.timestamp.milliSeconds = betoh64(hwAuthToken->timestamp); authToken.challenge = hwAuthToken->challenge; + authToken.userId = hwAuthToken->user_id; authToken.authenticatorId = hwAuthToken->authenticator_id; authToken.authenticatorType = static_cast<HardwareAuthenticatorType>( betoh32(hwAuthToken->authenticator_type));