Commit 674caeb6 authored by Leo Lai's avatar Leo Lai Committed by Commit Bot

Reland "UserSessionManager trigger tpm initialization whenever TPM is enabled."

This is a reland of f5684467

Original change's description:
> UserSessionManager trigger tpm initialization whenever TPM is enabled.
>
> we are obsoleting `TpmIsBeingOwned()`, which is not really necessary
> anyway; even if `TpmIsBeingOwned()` returns `true`, triggering the TPM
> initilaization again is just no-ops at ChromeOS side.
>
> BUG=b:172775884
> TEST=TBD if untitests needed.
>
> Change-Id: If4240a0c8a9a7485d77856e1e5c346c89407c09a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2532155
> Commit-Queue: Leo Lai <cylai@google.com>
> Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#826306}

Bug: b:172775884
Change-Id: I0499d47b9962f41bcfa956d6efa73b850a0b2021
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2534372Reviewed-by: default avatarAchuith Bhandarkar <achuith@chromium.org>
Commit-Queue: Leo Lai <cylai@google.com>
Cr-Commit-Position: refs/heads/master@{#827141}
parent 20df29fd
...@@ -1544,7 +1544,7 @@ void UserSessionManager::CompleteProfileCreateAfterAuthTransfer( ...@@ -1544,7 +1544,7 @@ void UserSessionManager::CompleteProfileCreateAfterAuthTransfer(
void UserSessionManager::PrepareTpmDeviceAndFinalizeProfile(Profile* profile) { void UserSessionManager::PrepareTpmDeviceAndFinalizeProfile(Profile* profile) {
BootTimesRecorder::Get()->AddLoginTimeMarker("TPMOwn-Start", false); BootTimesRecorder::Get()->AddLoginTimeMarker("TPMOwn-Start", false);
if (!tpm_util::TpmIsEnabled() || tpm_util::TpmIsBeingOwned()) { if (!tpm_util::TpmIsEnabled()) {
FinalizePrepareProfile(profile); FinalizePrepareProfile(profile);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment