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

Prevent windows below the keyguard from showing

Browse Source 
Fixes a bug where windows below the lock screen
could become visible if a SHOW_WHEN_LOCKED activity
hides the status bar.

Bug: 21450145
Change-Id: Ie660394cb96d7e6839bd4fb7c2729133bac2dfc5
This commit is contained in:
Adrian Roos
2015-06-03 14:41:18 -07:00
parent d3c9df1a34
commit 461829d607
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/view/WindowManagerPolicy.java
View File

@@ -1057,6 +1057,13 @@ public interface WindowManagerPolicy {
*/
public boolean isKeyguardSecure();
/**
* Return whether the keyguard is on.
*
* @return true if in keyguard is on.
*/
public boolean isKeyguardShowingOrOccluded();
/**
* inKeyguardRestrictedKeyInputMode
*

10
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -2116,7 +2116,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
case TYPE_KEYGUARD_SCRIM:
return false;
default:
return true;
// Hide only windows below the keyguard host window.
return windowTypeToLayerLw(win.getBaseType())
< windowTypeToLayerLw(TYPE_STATUS_BAR);
}
}
@@ -5515,6 +5517,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
return mKeyguardDelegate.isSecure();
}
/** {@inheritDoc} */
@Override
public boolean isKeyguardShowingOrOccluded() {
return mKeyguardDelegate == null ? false : mKeyguardDelegate.isShowing();
}
/** {@inheritDoc} */
@Override
public boolean inKeyguardRestrictedKeyInputMode() {

12
services/core/java/com/android/server/wm/WindowAnimator.java
View File

@@ -191,7 +191,8 @@ public class WindowAnimator {
private boolean shouldForceHide(WindowState win) {
final WindowState imeTarget = mService.mInputMethodTarget;
final boolean showImeOverKeyguard = imeTarget != null && imeTarget.isVisibleNow() &&
(imeTarget.getAttrs().flags & FLAG_SHOW_WHEN_LOCKED) != 0;
((imeTarget.getAttrs().flags & FLAG_SHOW_WHEN_LOCKED) != 0
|| !mPolicy.canBeForceHidden(imeTarget, imeTarget.mAttrs));
final WindowState winShowWhenLocked = (WindowState) mPolicy.getWinShowWhenLockedLw();
final AppWindowToken appShowWhenLocked = winShowWhenLocked == null ?
@@ -203,7 +204,11 @@ public class WindowAnimator {
|| (win.mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0 && win.isAnimatingLw()
// Show error dialogs over apps that dismiss keyguard.
|| (win.mAttrs.privateFlags & PRIVATE_FLAG_SYSTEM_ERROR) != 0)));
return (mForceHiding == KEYGUARD_SHOWN) && hideWhenLocked;
// Only hide windows if the keyguard is active and not animating away.
boolean keyguardOn = mPolicy.isKeyguardShowingOrOccluded()
&& mForceHiding != KEYGUARD_ANIMATING_OUT;
return keyguardOn && hideWhenLocked;
}
private void updateWindowsLocked(final int displayId) {
@@ -228,6 +233,7 @@ public class WindowAnimator {
winAnimator.mAnimation.setDuration(KEYGUARD_ANIM_TIMEOUT_MS);
winAnimator.mAnimationIsEntrance = false;
winAnimator.mAnimationStartTime = -1;
winAnimator.mKeyguardGoingAwayAnimation = true;
}
} else {
if (DEBUG_KEYGUARD) Slog.d(TAG,
@@ -310,7 +316,7 @@ public class WindowAnimator {
mKeyguardGoingAway = false;
}
if (win.isReadyForDisplay()) {
if (nowAnimating) {
if (nowAnimating && win.mWinAnimator.mKeyguardGoingAwayAnimation) {
mForceHiding = KEYGUARD_ANIMATING_OUT;
} else {
mForceHiding = win.isDrawnLw() ? KEYGUARD_SHOWN : KEYGUARD_NOT_SHOWN;