summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-07-22 15:27:47 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-22 15:27:47 -0700
commit556d0476e14803b406ddff7fe4c27baf1bf58334 (patch)
treed8cf4ab84f6fec43ff405f1ac043a6ca2713e559
parentc97b1c227a39780cce38a8d140d3e65086983330 (diff)
parenta5ed1454c469370ee0d0bb0221eba842c30e3ec1 (diff)
downloadframeworks_base-556d0476e14803b406ddff7fe4c27baf1bf58334.zip
frameworks_base-556d0476e14803b406ddff7fe4c27baf1bf58334.tar.gz
frameworks_base-556d0476e14803b406ddff7fe4c27baf1bf58334.tar.bz2
Merge "Fix typo which caused invalid rotations to be returned with NATIVE_WINDOW_TRANSFORM_HINT"
-rw-r--r--services/surfaceflinger/SurfaceTextureLayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceTextureLayer.cpp b/services/surfaceflinger/SurfaceTextureLayer.cpp
index 40659d4..91e010f 100644
--- a/services/surfaceflinger/SurfaceTextureLayer.cpp
+++ b/services/surfaceflinger/SurfaceTextureLayer.cpp
@@ -64,7 +64,7 @@ status_t SurfaceTextureLayer::queueBuffer(int buf, int64_t timestamp,
if (orientation & Transform::ROT_INVALID) {
orientation = 0;
}
- *outTransform = layer->getOrientation();
+ *outTransform = orientation;
}
return res;