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

2016-05-10 20:12:40 +00:00
parent a8f51e3e46 8481258303
commit fcc38e6c35
1 changed files with 2 additions and 1 deletions
--- 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.