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 
am: fcc38e6c35

* commit 'fcc38e6c35be0dd68d722b7398cf2fb66c1c0d92':
  Hide notification before tie managed profile lock

Change-Id: I57c3917ef0ccff555b340085bb1176a7d4ef6e0b
This commit is contained in:
Ricky Wai
2016-05-10 20:19:29 +00:00
committed by android-build-merger
parent 95ac395662 fcc38e6c35
commit 0cb5577ded
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) {
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.