summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jesse Hall <jessehall@google.com> 2015-03-24 20:59:51 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-03-24 20:59:51 +0000
commitc2a5b469a311891d8e3025aea0e4b348044dfaeb (patch)
tree63d34095f45ae0d9eb850cfc1df227c2a126f1ba
parentb4cf4d7d94c54a9fc49329aa891144f87f53602e (diff)
parenta527c07b8d078f7da1114b7055f65b479a148729 (diff)
am a527c07b: Merge "Fix mistake using width instead of height."
* commit 'a527c07b8d078f7da1114b7055f65b479a148729': Fix mistake using width instead of height.
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 7a1f2439fb..9dc140efd9 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3123,7 +3123,7 @@ void SurfaceFlinger::renderScreenImplLocked(
const int32_t hw_w = hw->getWidth();
const int32_t hw_h = hw->getHeight();
const bool filtering = static_cast<int32_t>(reqWidth) != hw_w ||
- static_cast<int32_t>(reqWidth) != hw_h;
+ static_cast<int32_t>(reqHeight) != hw_h;
// if a default or invalid sourceCrop is passed in, set reasonable values
if (sourceCrop.width() == 0 || sourceCrop.height() == 0 ||