summaryrefslogtreecommitdiffstats
path: root/services/core/java/com/android/server/wm
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-08-22 00:16:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-22 00:16:34 +0000
commit2021956a1c35dba2b88257dc4a8eed8fa0acd650 (patch)
tree2efdfbe9e41fa7c8841568aed9994f4bfdeaddd2 /services/core/java/com/android/server/wm
parent83526e3bbdff8e8ca3f85616d0678eb5d00ae3b7 (diff)
parentab45a217b0002dcf586d529ab8581cacbbfc37e9 (diff)
downloadframeworks_base-2021956a1c35dba2b88257dc4a8eed8fa0acd650.zip
frameworks_base-2021956a1c35dba2b88257dc4a8eed8fa0acd650.tar.gz
frameworks_base-2021956a1c35dba2b88257dc4a8eed8fa0acd650.tar.bz2
am ab45a217: Make wake-and-unlock faster
* commit 'ab45a217b0002dcf586d529ab8581cacbbfc37e9': Make wake-and-unlock faster
Diffstat (limited to 'services/core/java/com/android/server/wm')
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index da2042c..2c02967 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -11953,12 +11953,18 @@ public class WindowManagerService extends IWindowManager.Stub
final WindowList windows = getDefaultWindowListLocked();
for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {
final WindowState win = windows.get(winNdx);
+ final boolean isForceHiding = mPolicy.isForceHiding(win.mAttrs);
if (win.isVisibleLw()
- && (win.mAppToken != null || mPolicy.isForceHiding(win.mAttrs))) {
+ && (win.mAppToken != null || isForceHiding)) {
win.mWinAnimator.mDrawState = WindowStateAnimator.DRAW_PENDING;
// Force add to mResizingWindows.
win.mLastContentInsets.set(-1, -1, -1, -1);
mWaitingForDrawn.add(win);
+
+ // No need to wait for the windows below Keyguard.
+ if (isForceHiding) {
+ break;
+ }
}
}
requestTraversalLocked();