commit 3bef939f948ba93bebd92ee59f4a4f1a099b0e42
author Zhuoyao Zhang <zhuoyao@google.com> Mon Feb 13 18:03:06 2017 -0800
committer Zhuoyao Zhang <zhuoyao@google.com> Mon Feb 13 18:03:06 2017 -0800
tree 6876b0a813110f20d6a456c05efa2072b0e9b073
parent e445f52e23e6fd67bea16c4877517439ffce77f1

Update .vts files on master based on the latest .hal file and hidl-gen

Test: mma
Change-Id: I9558f300505db83e26f7c241c5cf729cd005a07b

graphics/composer/2.1/vts/Composer.vts

diff --git a/graphics/composer/2.1/vts/Composer.vts b/graphics/composer/2.1/vts/Composer.vts
index ee5c650..e60e39c 100644
--- a/graphics/composer/2.1/vts/Composer.vts
+++ b/graphics/composer/2.1/vts/Composer.vts
@@ -4,8 +4,11 @@
 
 package: "android.hardware.graphics.composer"
 
+import: "android.hardware.graphics.common@1.0::types"
+import: "android.hardware.graphics.composer@2.1::IComposerCallback"
 import: "android.hardware.graphics.composer@2.1::IComposerClient"
 import: "android.hardware.graphics.composer@2.1::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
     attribute: {
@@ -73,8 +76,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "IComposerClient"
-            is_callback: false
+            predefined_type: "::android::hardware::graphics::composer::V2_1::IComposerClient"
         }
         callflow: {
             entry: true

graphics/composer/2.1/vts/ComposerCallback.vts

diff --git a/graphics/composer/2.1/vts/ComposerCallback.vts b/graphics/composer/2.1/vts/ComposerCallback.vts
index a5a2aa9..b83cf94 100644
--- a/graphics/composer/2.1/vts/ComposerCallback.vts
+++ b/graphics/composer/2.1/vts/ComposerCallback.vts
@@ -5,6 +5,7 @@
 package: "android.hardware.graphics.composer"
 
 import: "android.hardware.graphics.composer@2.1::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
     attribute: {

graphics/composer/2.1/vts/ComposerClient.vts

diff --git a/graphics/composer/2.1/vts/ComposerClient.vts b/graphics/composer/2.1/vts/ComposerClient.vts
index db6b1ff..ac1d7fb 100644
--- a/graphics/composer/2.1/vts/ComposerClient.vts
+++ b/graphics/composer/2.1/vts/ComposerClient.vts
@@ -7,6 +7,7 @@
 import: "android.hardware.graphics.common@1.0::types"
 import: "android.hardware.graphics.composer@2.1::IComposerCallback"
 import: "android.hardware.graphics.composer@2.1::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
     attribute: {
@@ -422,8 +423,7 @@
         name: "registerCallback"
         arg: {
             type: TYPE_HIDL_CALLBACK
-            predefined_type: "IComposerCallback"
-            is_callback: true
+            predefined_type: "::android::hardware::graphics::composer::V2_1::IComposerCallback"
         }
         callflow: {
             entry: true
@@ -849,6 +849,11 @@
             predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
         }
         arg: {
+            type: TYPE_FMQ_SYNC
+            fmq_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
         }
         callflow: {
             next: "*"
@@ -862,6 +867,11 @@
             predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
         }
         return_type_hidl: {
+            type: TYPE_FMQ_SYNC
+            fmq_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint32_t"
+            }
         }
         callflow: {
             next: "*"