Skip to content

GitLab

T
tangled
Commit dec9a7f7 authored by tbarzic's avatar tbarzic Committed by Commit bot
Browse files
Options

Fix a startup crash from https://crrev.com/5eb3ae10901fa65657abc902910265ab492c5dbf 

EasyUnlockKeymanager is not initialized when UpdateEasyUnlockKeys is called
from FinalizePrepareProfile

BUG=419883,422102

Review URL: https://codereview.chromium.org/642153003

Cr-Commit-Position: refs/heads/master@{#299024}
parent 9fa7761f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
chrome/browser/chromeos/login/session/user_session_manager.cc
View file @ dec9a7f7
...@@ -1050,16 +1050,17 @@ void UserSessionManager::UpdateEasyUnlockKeys(const UserContext& user_context) { ...@@ -1050,16 +1050,17 @@ void UserSessionManager::UpdateEasyUnlockKeys(const UserContext& user_context) {
EasyUnlockScreenlockStateHandler::NO_HARDLOCK); EasyUnlockScreenlockStateHandler::NO_HARDLOCK);
} }
EasyUnlockKeyManager* key_manager = GetEasyUnlockKeyManager();
running_easy_unlock_key_ops_ = true; running_easy_unlock_key_ops_ = true;
if (device_list) { if (device_list) {
easy_unlock_key_manager_->RefreshKeys( key_manager->RefreshKeys(
user_context, user_context,
*device_list, *device_list,
base::Bind(&UserSessionManager::OnEasyUnlockKeyOpsFinished, base::Bind(&UserSessionManager::OnEasyUnlockKeyOpsFinished,
AsWeakPtr(), AsWeakPtr(),
user_context.GetUserID())); user_context.GetUserID()));
} else { } else {
easy_unlock_key_manager_->RemoveKeys( key_manager->RemoveKeys(
user_context, user_context,
0, 0,
base::Bind(&UserSessionManager::OnEasyUnlockKeyOpsFinished, base::Bind(&UserSessionManager::OnEasyUnlockKeyOpsFinished,
......
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