Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6170c887 authored by Paul Crowley's avatar Paul Crowley Committed by android-build-merger
Browse files

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

am: 9f519245

* commit '9f519245':
  Hide notification before tie managed profile lock

Change-Id: I42e029fb6f972fd03c0ffa34f96a76a58390ce15
parents d0da89dc 9f519245

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

+2 −1
Original line number Diff line number Diff line
@@ -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.