commit ccc06b6f5150f6728df6b3dbb8eaa0f9572cf37d
author Peiyong Lin <lpy@google.com> Tue Jun 25 17:31:09 2019 -0700
committer Peiyong Lin <lpy@google.com> Wed Jun 26 11:40:08 2019 -0700
tree d489f2c7a975ed8a0e5765956442dfd93d6e4219
parent 370d19f213d01b8437d8a1c5e4d1451f8938d4e1

Attach color space information when attach and queue buffer.

Currently when calling attachAndQueueBuffer, the color space information is
lost. This results in color shift if the color space doesn't match the color
space of the surface.

BUG: b/135002842, b/131928312
Test: boot. Manually verified on P19
Change-Id: I95ec73c24942f79197d25ee85f139b2aaf805677

services/core/java/com/android/server/wm/ScreenRotationAnimation.java

diff --git a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
index b90d602..6fd802d 100644
--- a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
+++ b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
@@ -279,7 +279,8 @@
                 mService.mDisplayManagerInternal.screenshot(displayId);
             if (gb != null) {
                 try {
-                    surface.attachAndQueueBuffer(gb.getGraphicBuffer());
+                    surface.attachAndQueueBufferWithColorSpace(gb.getGraphicBuffer(),
+                            gb.getColorSpace());
                 } catch (RuntimeException e) {
                     Slog.w(TAG, "Failed to attach screenshot - " + e.getMessage());
                 }