summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/locksettings/LockSettingsService.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 1b705bb7c4be..b13cd1e1f0d4 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -483,6 +483,12 @@ public class LockSettingsService extends ILockSettings.Stub {
return;
}
+ if (isUserKeyUnlocked(userId)) {
+ // If storage is not locked, the user will be automatically unlocked so there is
+ // no need to show the notification.
+ return;
+ }
+
final UserHandle userHandle = user.getUserHandle();
final boolean isSecure = isUserSecure(userId);
if (isSecure && !mUserManager.isUserUnlockingOrUnlocked(userHandle)) {