Commit ae68e865 authored by Scott Little's avatar Scott Little Committed by Commit Bot

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

This reverts commit 674caeb6.

Reason for revert: Broke ASAN browser tests: https://ci.chromium.org/p/chromium/builders/ci/Linux%20Chromium%20OS%20ASan%20LSan%20Tests%20%281%29/38849

The initial CL (before the reland) was previously reverted, and now relanded, corresponding to the test failures in both the initial landing and the reland. See https://bugs.chromium.org/p/chromium/issues/detail?id=1148771#c3 for a more detailed explanation including discussing other possible culprit CLs.

Original change's description:
> 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/+/2534372
> Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
> Commit-Queue: Leo Lai <cylai@google.com>
> Cr-Commit-Position: refs/heads/master@{#827141}

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

Change-Id: I5f443979f1f420f1abaf1371cac10c10f1eb2b0d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: b:172775884, 1148771
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2537580Reviewed-by: default avatarScott Little <sclittle@chromium.org>
Commit-Queue: Scott Little <sclittle@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827323}
parent 5cee6c65
...@@ -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