| commit | 441f381b7bda74849faea00d048340c3295a53e8 | [log] [tgz] |
|---|---|---|
| author | Wale Ogunwale <ogunwale@google.com> | Fri Jul 28 16:21:33 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 28 16:21:33 2017 +0000 |
| tree | 31cb3372e09e201eb184d73956be1eb3dcb74a01 | |
| parent | 7f2953e9876cba25b2c0bab98320a38556d30150 [diff] | |
| parent | 932bc6dffcdd2bfeba58821d0a48968a8f45c098 [diff] |
Merge "Don't freeze display if it isn't okay to animate." into oc-dr1-dev am: 932bc6dffc Change-Id: Icee06050d8000ada0ed7973a7befb90a1273238b
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index f0ac39a..5db691e 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -6011,9 +6011,9 @@ return; } - if (!displayContent.isReady() || !mPolicy.isScreenOn()) { - // No need to freeze the screen before the display is ready, system is ready, or if - // the screen is off. + if (!displayContent.isReady() || !mPolicy.isScreenOn() || !okToAnimate()) { + // No need to freeze the screen before the display is ready, if the screen is off, + // or we can't currently animate. return; }