commit d9dcc1752ee2a1f5142c37d3eb0a09358bbefa64
author Pawin Vongmasa <pawin@google.com> Sat Mar 02 02:31:02 2019 -0800
committer Pawin Vongmasa <pawin@google.com> Tue Mar 19 07:48:15 2019 -0700
tree e30eba3d4edfc4b4ef298f9e5318593ff0fba0fb
parent d80b5bb7dd1377f54b886a435b0e7f6aad74599e

Use @2.0::IGraphicBufferProducer in media.c2

Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Bug: 33350696
Bug: 112362730
Change-Id: I561b96b4a416a92649bd1de174d55c6317d9b40a

media/c2/1.0/Android.bp

diff --git a/media/c2/1.0/Android.bp b/media/c2/1.0/Android.bp
index 6c836af..7307a81 100644
--- a/media/c2/1.0/Android.bp
+++ b/media/c2/1.0/Android.bp
@@ -19,7 +19,10 @@
     ],
     interfaces: [
         "android.hardware.graphics.bufferqueue@1.0",
+        "android.hardware.graphics.bufferqueue@2.0",
         "android.hardware.graphics.common@1.0",
+        "android.hardware.graphics.common@1.1",
+        "android.hardware.graphics.common@1.2",
         "android.hardware.media.bufferpool@2.0",
         "android.hardware.media.omx@1.0",
         "android.hardware.media@1.0",

media/c2/1.0/IComponent.hal

diff --git a/media/c2/1.0/IComponent.hal b/media/c2/1.0/IComponent.hal
index abd1448..51ef4e1 100644
--- a/media/c2/1.0/IComponent.hal
+++ b/media/c2/1.0/IComponent.hal
@@ -17,6 +17,7 @@
 package android.hardware.media.c2@1.0;
 
 import android.hardware.graphics.bufferqueue@1.0::IGraphicBufferProducer;
+import android.hardware.graphics.bufferqueue@2.0::IGraphicBufferProducer;
 import android.hardware.media.omx@1.0::IGraphicBufferSource;
 
 import IConfigurable;
@@ -128,7 +129,7 @@
      */
     setOutputSurface(
             uint64_t blockPoolId,
-            IGraphicBufferProducer surface
+            @2.0::IGraphicBufferProducer surface
         ) generates (
             Status status
         );
@@ -184,7 +185,7 @@
      *     null.
      */
     connectToOmxInputSurface(
-            IGraphicBufferProducer producer,
+            @1.0::IGraphicBufferProducer producer,
             IGraphicBufferSource source
         ) generates (
             Status status,

media/c2/1.0/IInputSink.hal

diff --git a/media/c2/1.0/IInputSink.hal b/media/c2/1.0/IInputSink.hal
index 809c27a..767eb73 100644
--- a/media/c2/1.0/IInputSink.hal
+++ b/media/c2/1.0/IInputSink.hal
@@ -16,8 +16,6 @@
 
 package android.hardware.media.c2@1.0;
 
-import android.hardware.graphics.bufferqueue@1.0::IGraphicBufferProducer;
-
 import IConfigurable;
 
 /**

media/c2/1.0/IInputSurface.hal

diff --git a/media/c2/1.0/IInputSurface.hal b/media/c2/1.0/IInputSurface.hal
index d11ce15..3eee7f1 100644
--- a/media/c2/1.0/IInputSurface.hal
+++ b/media/c2/1.0/IInputSurface.hal
@@ -16,7 +16,7 @@
 
 package android.hardware.media.c2@1.0;
 
-import android.hardware.graphics.bufferqueue@1.0::IGraphicBufferProducer;
+import android.hardware.graphics.bufferqueue@2.0::IGraphicBufferProducer;
 
 import IConfigurable;
 import IInputSink;