commit 4fbd956daba0a71f9bca0152c1104246292fa414
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 10 22:13:22 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 10 22:13:22 2019 +0000
tree 45e34e2d2d9407fd1187c600559a9261998da09b
parent 22f9d7ea44ef20db568667dc7f00b82efb444b3b
parent e13ce669deddb5f1823470531f2273021011ac1f

Merge "Do not show work profile encryption notification if already unlocked." into qt-dev

services/core/java/com/android/server/locksettings/LockSettingsService.java

diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 1b705bb..b13cd1e 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 @@
             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)) {