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

Assume that profile with separate lock is locked if showing keyguard.

Browse Source 
Bug: 128988840
Test: manual, unlock profile, go to keyguard, get notification.
Change-Id: I423ff11871ee8cbde4fd3da0e8cb39021af488fc
This commit is contained in:
Pavel Grafov
2019-05-23 15:39:49 +01:00
parent 6494b52f39
commit 8538412c4e
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java
View File

@@ -513,14 +513,11 @@ public class NotificationLockscreenUserManagerImpl implements
boolean isProfilePublic = devicePublic;
boolean needsSeparateChallenge = mLockPatternUtils.isSeparateProfileChallengeEnabled(
userId);
if (!devicePublic && userId != getCurrentUserId()) {
// We can't rely on KeyguardManager#isDeviceLocked() for unified profile challenge
// due to a race condition where this code could be called before
// TrustManagerService updates its internal records, resulting in an incorrect
// state being cached in mLockscreenPublicMode. (b/35951989)
if (needsSeparateChallenge && isSecure(userId)) {
isProfilePublic = mKeyguardManager.isDeviceLocked(userId);
}
if (!devicePublic && userId != getCurrentUserId()
&& needsSeparateChallenge && isSecure(userId)) {
// Keyguard.isDeviceLocked is updated asynchronously, assume that all profiles
// with separate challenge are locked when keyguard is visible to avoid race.
isProfilePublic = showingKeyguard || mKeyguardManager.isDeviceLocked(userId);
}
setLockscreenPublicMode(isProfilePublic, userId);
mUsersWithSeperateWorkChallenge.put(userId, needsSeparateChallenge);