commit f6833405315cb679e26eb1c582fe1b73259801cf
author Yichi Chen <yichichen@google.com> Fri Jun 22 17:32:10 2018 +0800
committer Yichi Chen <yichichen@google.com> Mon Jun 25 23:31:47 2018 +0800
tree 94bada9ca5cb96e95612a1977d068d8d42bb9b21
parent 983ebb59f8d083016db8e4888e5e11d67b916b1b

SurfaceFlinger: Remove the duty of ColorLayer in computeCrop

There is no active buffer in ColorLayer. Computing its source crop is
nonsense and may cause unwanted behavior in HWC.

Bug: b/109829386
Test: ColorLayer can be displayed correctly.

Change-Id: Ia30bb13e932a55a5cfb0a38da2c459d53dff5e3b

services/surfaceflinger/Layer.h

diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index fb94058..49c0d63 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -556,7 +556,7 @@
 
     uint32_t getEffectiveUsage(uint32_t usage) const;
 
-    FloatRect computeCrop(const sp<const DisplayDevice>& display) const;
+    virtual FloatRect computeCrop(const sp<const DisplayDevice>& display) const;
     // Compute the initial crop as specified by parent layers and the
     // SurfaceControl for this layer. Does not include buffer crop from the
     // IGraphicBufferProducer client, as that should not affect child clipping.