From 64a3cca2f9c3dfcd1bb701d369acdaaf29257775 Mon Sep 17 00:00:00 2001 From: Sergey Nikolaienkov Date: Wed, 10 Jun 2020 07:28:13 +0200 Subject: Move onKeyguardChangded() to completeUnlockUser() (async) Move the onKeyguardChanged() call from onUnlockUser() (sync) to completeUnlockUser (async). Test: adb logcat | grep "\(SystemUserUnlock\|UnlockingUser-0\)\ took" Test: plugin a USB drive to ATV device, make sure it gets discovered Bug: 158524880 Bug: 156220570 Change-Id: I7e92946e3326e060ee5f9f54cc71cda1bc68f784 --- services/core/java/com/android/server/StorageManagerService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 8eb401a7ee55..24b35daa5476 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -1135,8 +1135,6 @@ class StorageManagerService extends IStorageManager.Stub Slog.wtf(TAG, e); } - onKeyguardStateChanged(false); - mHandler.obtainMessage(H_COMPLETE_UNLOCK_USER, userId).sendToTarget(); } @@ -1148,6 +1146,8 @@ class StorageManagerService extends IStorageManager.Stub mPmInternal.migrateLegacyObbData(); } + onKeyguardStateChanged(false); + // Record user as started so newly mounted volumes kick off events // correctly, then synthesize events for any already-mounted volumes. synchronized (mLock) { -- cgit v1.2.3-59-g8ed1b