commit 356bcd4144e87f570fe412e2bd31b1af796b429f
author Fabien Sanglard <sanglardf@google.com> Fri Feb 17 16:14:18 2017 -0800
committer Fabien Sanglard <sanglardf@google.com> Fri Feb 17 16:14:18 2017 -0800
tree e8f1c92a3f9b3ff7c091fb8c2a65f39762537c51
parent a01c1e34edd90bc000aa80c6bb42aebcbd7ca8f9

Discard surfaceDamage for HWC1 v < 1.5

Test: Manual
Change-Id: Ia9193a88dc6df206c8f197adf144466f164afa1c

services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp b/services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp
index a6171f5..1d2c178 100644
--- a/services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp
@@ -2046,6 +2046,10 @@
 
 Error HWC2On1Adapter::Layer::setSurfaceDamage(hwc_region_t damage)
 {
+    // HWC1 supports surface damage starting only with version 1.5.
+    if (mDisplay.getDevice().mHwc1MinorVersion < 5) {
+        return Error::None;
+    }
     mSurfaceDamage.resize(damage.numRects);
     std::copy_n(damage.rects, damage.numRects, mSurfaceDamage.begin());
     return Error::None;