commit b04e1052099be46c4aefd2005735e934dcf8c45d
author JP Abgrall <jpa@google.com> Wed Aug 24 16:09:51 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 24 16:09:51 2011 -0700
tree 4f296a8e2b300bc7cf10a4ebba1a1b8daa3a6e9a
parent a7a08ebb741d4f38c5627edde215a111ec4d112d
parent 19db3d8a7393d618a78edeefd6ac8a8868912453

Merge "dumpstate: dump qtaguid info, ip6tables info, buddyinfo"

include/ui/GraphicBuffer.h

diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h
index 370253a..b9deafc 100644
--- a/include/ui/GraphicBuffer.h
+++ b/include/ui/GraphicBuffer.h
@@ -62,6 +62,7 @@
         USAGE_HW_TEXTURE        = GRALLOC_USAGE_HW_TEXTURE,
         USAGE_HW_RENDER         = GRALLOC_USAGE_HW_RENDER,
         USAGE_HW_2D             = GRALLOC_USAGE_HW_2D,
+        USAGE_HW_COMPOSER       = GRALLOC_USAGE_HW_COMPOSER,
         USAGE_HW_MASK           = GRALLOC_USAGE_HW_MASK
     };
 

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 8b2485a..f8925b8 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -556,6 +556,7 @@
         // need a hardware-protected path to external video sink
         usage |= GraphicBuffer::USAGE_PROTECTED;
     }
+    usage |= GraphicBuffer::USAGE_HW_COMPOSER;
     return usage;
 }