summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-08-24 21:41:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-24 21:41:43 +0000
commit8a8885b91de361b3a6a975e380e4a00fa92f8d7d (patch)
treedd42df89b6f4010cd5e223b6385559ce38dcf770 /services
parent414985c422664c7f8d5dec5562b502907b965876 (diff)
parentdef6896d10ce4869831bf91eb73709e8a9714b27 (diff)
downloadframeworks_base-8a8885b91de361b3a6a975e380e4a00fa92f8d7d.zip
frameworks_base-8a8885b91de361b3a6a975e380e4a00fa92f8d7d.tar.gz
frameworks_base-8a8885b91de361b3a6a975e380e4a00fa92f8d7d.tar.bz2
am def6896d: Fix shifted wallpaper after OTA
* commit 'def6896d10ce4869831bf91eb73709e8a9714b27': Fix shifted wallpaper after OTA
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/wm/WindowStateAnimator.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index ab56d5e..726d29d 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -1589,8 +1589,6 @@ class WindowStateAnimator {
final int left = ((int) shownFrame.left) - attrs.surfaceInsets.left;
final int top = ((int) shownFrame.top) - attrs.surfaceInsets.top;
if (mSurfaceX != left || mSurfaceY != top) {
- mSurfaceX = left;
- mSurfaceY = top;
if (mAnimating) {
// If this window (or its app token) is animating, then the position
// of the surface will be re-computed on the next animation frame.
@@ -1598,6 +1596,8 @@ class WindowStateAnimator {
// transformation is being applied by the animation.
return;
}
+ mSurfaceX = left;
+ mSurfaceY = top;
if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG, ">>> OPEN TRANSACTION setWallpaperOffset");
SurfaceControl.openTransaction();
try {