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

Merge "Follow-up for I8cbf1bfbebc917b03f528f040bb019d193228bbb" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-24 13:41:41 +00:00
committed by Android (Google) Code Review
parent 5281775760 ec7708a4f6
commit 6adb089cab
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5493,9 +5493,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
*/
private boolean setKeyguardOccludedLw(boolean isOccluded, boolean force) {
if (DEBUG_KEYGUARD) Slog.d(TAG, "setKeyguardOccluded occluded=" + isOccluded);
boolean wasOccluded = mKeyguardOccluded;
boolean showing = mKeyguardDelegate.isShowing();
if (wasOccluded && !isOccluded && showing) {
final boolean wasOccluded = mKeyguardOccluded;
final boolean showing = mKeyguardDelegate.isShowing();
final boolean changed = wasOccluded != isOccluded || force;
if (!isOccluded && changed && showing) {
mKeyguardOccluded = false;
mKeyguardDelegate.setOccluded(false, true /* animate */);
if (mStatusBar != null) {
@@ -5505,7 +5506,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
}
return true;
} else if (!wasOccluded && isOccluded && showing) {
} else if (isOccluded && changed && showing) {
mKeyguardOccluded = true;
mKeyguardDelegate.setOccluded(true, false /* animate */);
if (mStatusBar != null) {
@@ -5513,7 +5514,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mStatusBar.getAttrs().flags &= ~FLAG_SHOW_WALLPAPER;
}
return true;
} else if (wasOccluded != isOccluded) {
} else if (changed) {
mKeyguardOccluded = isOccluded;
mKeyguardDelegate.setOccluded(isOccluded, false /* animate */);
return false;