Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Paul Crowley
2016-05-10 20:12:40 +00:00
committed by Android (Google) Code Review
parent a8f51e3e46 8481258303
commit fcc38e6c35
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/LockSettingsService.java
View File

@@ -340,8 +340,9 @@ public class LockSettingsService extends ILockSettings.Stub {
} }
public void onUnlockUser(int userId) { public void onUnlockUser(int userId) {
tieManagedProfileLockIfNecessary(userId, null); // Hide notification first, as tie managed profile lock takes time
hideEncryptionNotification(new UserHandle(userId)); hideEncryptionNotification(new UserHandle(userId));
tieManagedProfileLockIfNecessary(userId, null);
// Now we have unlocked the parent user we should show notifications // Now we have unlocked the parent user we should show notifications
// about any profiles that exist. // about any profiles that exist.