Commit a33ddbb9 authored by Yuki Shiino's avatar Yuki Shiino Committed by Commit Bot

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

This reverts commit f5684467.

Reason for revert: Suspicious about test failures on bots:
ExistingUserControllerActiveDirectoryTest
https://ci.chromium.org/p/chromium/builders/ci/Linux%20ChromiumOS%20MSan%20Tests/21268
https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-dbg/21256
https://ci.chromium.org/p/chromium/builders/ci/Linux%20Chromium%20OS%20ASan%20LSan%20Tests%20%281%29/38839

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}

TBR=achuith@chromium.org,alemate@chromium.org,cylai@google.com

Change-Id: I1727f2b194a60cb5f684cd9205902ec4ebb33ee4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: b:172775884
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2531804Reviewed-by: default avatarYuki Shiino <yukishiino@chromium.org>
Commit-Queue: Yuki Shiino <yukishiino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826657}
parent e88ed2f3
...@@ -1534,7 +1534,7 @@ void UserSessionManager::CompleteProfileCreateAfterAuthTransfer( ...@@ -1534,7 +1534,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()) { if (!tpm_util::TpmIsEnabled() || tpm_util::TpmIsBeingOwned()) {
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