Commit 28dfc873 authored by tbarzic's avatar tbarzic Committed by Commit bot

Don't disable easy unlock app on keyed service shutdown

For signin profile, disable it on user login.

BUG=458660

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

Cr-Commit-Position: refs/heads/master@{#316349}
parent b59a3395
...@@ -522,8 +522,6 @@ void EasyUnlockService::Shutdown() { ...@@ -522,8 +522,6 @@ void EasyUnlockService::Shutdown() {
ShutdownInternal(); ShutdownInternal();
app_manager_->DisableAppIfLoaded();
ResetScreenlockState(); ResetScreenlockState();
bluetooth_detector_.reset(); bluetooth_detector_.reset();
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
......
...@@ -261,6 +261,8 @@ void EasyUnlockServiceSignin::OnScreenDidUnlock( ...@@ -261,6 +261,8 @@ void EasyUnlockServiceSignin::OnScreenDidUnlock(
if (screen_type != ScreenlockBridge::LockHandler::SIGNIN_SCREEN) if (screen_type != ScreenlockBridge::LockHandler::SIGNIN_SCREEN)
return; return;
DisableAppWithoutResettingScreenlockState();
Shutdown(); Shutdown();
} }
......
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