summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-06-01 16:57:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-06-01 16:57:53 +0000
commit7576f12f382bbff45949ac58eed317a85cc0effc (patch)
treecfcc0a055bcd713e0649cca1b58a1efeaed56e01
parentcf1d2488a1bc5f4db11d5de62a1fee20fa8d7e69 (diff)
parent5a5da871ec76277d32e427c9f40e17333f60d166 (diff)
Merge "Notify that keyguard is dismissed when user is unlocked" into rvc-dev am: 6c85a4aceb am: 5a5da871ec
Change-Id: Ie4743034e84cb61d95d32fd849856215fca0a975
-rw-r--r--services/core/java/com/android/server/StorageManagerService.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index ee0f71b9e982..b3e28cb946a9 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();
}