Merge "Hide notification before tie managed profile lock" into nyc-dev

1 files changed, 2 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java
index c2a1c50a8d2b..cec32291cb30 100644
--- a/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@ -340,8 +340,9 @@ public class LockSettingsService extends ILockSettings.Stub {
     }
 
     public void onUnlockUser(int userId) {
-        tieManagedProfileLockIfNecessary(userId, null);
+        // Hide notification first, as tie managed profile lock takes time
         hideEncryptionNotification(new UserHandle(userId));
+        tieManagedProfileLockIfNecessary(userId, null);
 
         // Now we have unlocked the parent user we should show notifications
         // about any profiles that exist.