Merge "Respect always unlocked displays when keyguard is shown." into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
68c74f4c51
@@ -1061,8 +1061,10 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
|
|||||||
displayHasContent = true;
|
displayHasContent = true;
|
||||||
} else if (displayContent != null &&
|
} else if (displayContent != null &&
|
||||||
(!mObscureApplicationContentOnSecondaryDisplays
|
(!mObscureApplicationContentOnSecondaryDisplays
|
||||||
|
|| displayContent.isKeyguardAlwaysUnlocked()
|
||||||
|| (obscured && type == TYPE_KEYGUARD_DIALOG))) {
|
|| (obscured && type == TYPE_KEYGUARD_DIALOG))) {
|
||||||
// Allow full screen keyguard presentation dialogs to be seen.
|
// Allow full screen keyguard presentation dialogs to be seen, or simply ignore the
|
||||||
|
// keyguard if this display is always unlocked.
|
||||||
displayHasContent = true;
|
displayHasContent = true;
|
||||||
}
|
}
|
||||||
if ((privateflags & PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE) != 0) {
|
if ((privateflags & PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE) != 0) {
|
||||||
|
|||||||
Reference in New Issue
Block a user