summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson Chung <winsonc@google.com> 2014-10-01 17:10:40 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-10-01 17:10:40 +0000
commitbb6a08cfdb93545fba30dea5c0cf13ae06edc3e7 (patch)
tree2fac96a6f0565a7a7e1ee731bca43abdc7ec5867
parent2a988941fc485a072daa04bc9b592f113a1aef7d (diff)
parenta173d9c83f411c74c2dfe8214a0f32cf6b66b7e7 (diff)
am a173d9c8: am 57583c33: am d164460e: am 86ef70eb: Fixing build (Bug 17381033)
* commit 'a173d9c83f411c74c2dfe8214a0f32cf6b66b7e7': Fixing build (Bug 17381033)
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java2
1 files changed, 1 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 bd75a6c46583..41574ca6130c 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -9102,7 +9102,7 @@ public class WindowManagerService extends IWindowManager.Stub
// Ensure that apps that are mid-starting are also scheduled to have their
// starting windows removed after the animation is complete
if (wtoken.startingWindow != null && !wtoken.startingWindow.mExiting) {
- scheduleRemoveStartingWindow(wtoken);
+ scheduleRemoveStartingWindowLocked(wtoken);
}
if (animLp != null) {