commit 310ac5e48a758482273b22b7aa03ef2509248df1
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Feb 18 01:52:17 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 18 01:52:17 2017 +0000
tree eb0768afe94127aa6b2afbe2571c49d17ec105b8
parent c1ae13ed156e826fb5b3a237843ce87eabdd1c6f
parent 356bcd4144e87f570fe412e2bd31b1af796b429f

Merge "Discard surfaceDamage for HWC1 v < 1.5"

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;