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

Merge "Assume that profile with separate lock is locked if showing keyguard." into qt-dev

Browse Source
This commit is contained in:
Pavel Grafov
2019-05-24 11:05:08 +00:00
committed by Android (Google) Code Review
parent d904cb583b 8538412c4e
commit b48341391f
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);