From 33e2b6ae44d428993e0e5c8c9b33d6266b7900d4 Mon Sep 17 00:00:00 2001 From: Sergey Nikolaienkov Date: Mon, 25 May 2020 17:17:09 +0200 Subject: [PATCH] Notify that keyguard is dismissed when user is unlocked Follow the steps of UsbDeviceManager and call onKeyguardStateChange(false) from onUlockUser(...) in StorageManagerService. Without this, on the devices that do not have keyguard (such as TVs) StorageManagerService.mSecureKeyguardShowing never changes, and remains 'true'forever (set initially to 'true' due to security concerns), also the this incorrectly set value gets passed to vold, causing the latter to skip newly added disks. Bug: 156220570 Test: ran manually, attached USB drive, monitored vold logs Change-Id: Ib9b04c5fcd173da9894084002400c691a5c10b57 --- .../core/java/com/android/server/StorageManagerService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index ee0f71b9e9824..b3e28cb946a90 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -1134,6 +1134,8 @@ class StorageManagerService extends IStorageManager.Stub Slog.wtf(TAG, e); } + onKeyguardStateChanged(false); + mHandler.obtainMessage(H_COMPLETE_UNLOCK_USER, userId).sendToTarget(); }