summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chong Zhang <chz@google.com> 2015-01-05 11:25:39 -0800
committer Chong Zhang <chz@google.com> 2015-04-06 12:24:53 -0700
commit7f97af11fba6a18ee6bc022f7197319ce54fa46f (patch)
treef2777d1debdbd385f4a03cb8f066996b51ceada2
parent3640409fd924b88d94bef833a6e96ba34bb53601 (diff)
fix the flash caused by missing setMatrix() when surface size changes
bug: 18773834 Change-Id: I16e2f896e6fd70e9b130bb55ecefa8c2f08c684a
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java2
-rw-r--r--services/core/java/com/android/server/wm/WindowStateAnimator.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 32bb78e32281..294227815826 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -9883,7 +9883,7 @@ public class WindowManagerService extends IWindowManager.Stub
}
}
- winAnimator.setSurfaceBoundariesLocked(recoveringMemory);
+ winAnimator.prepareSurfaceLocked(recoveringMemory);
final AppWindowToken atoken = w.mAppToken;
if (DEBUG_STARTING_WINDOW && atoken != null
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index ac1b0f1cbf23..056267d9ecf7 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -1341,7 +1341,7 @@ class WindowStateAnimator {
}
}
- void setSurfaceBoundariesLocked(final boolean recoveringMemory) {
+ private void setSurfaceBoundariesLocked(final boolean recoveringMemory) {
final WindowState w = mWin;
int width;