commit 4a0da2d1cfd3f2029336860eb7b1d160c3fad5f4
author Zhuoyao Zhang <zhuoyao@google.com> Wed Nov 02 21:04:43 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 02 21:04:43 2016 +0000
tree ac92e14376ead95cdd464477dc2f4ac0901ad995
parent 260a5de36ebbb7ece09d0b0705d3233c4c03b39a
parent 0d0a5eab4485b66e983199504ce0785ac1d02939

Merge "update the .vts files for nfc and vibrate."

nfc/1.0/vts/NfcClientCallback.vts

diff --git a/nfc/1.0/vts/NfcClientCallback.vts b/nfc/1.0/vts/NfcClientCallback.vts
index e2a3e5b..e39ea7c 100644
--- a/nfc/1.0/vts/NfcClientCallback.vts
+++ b/nfc/1.0/vts/NfcClientCallback.vts
@@ -11,11 +11,11 @@
         name: "sendEvent"
         arg: {
             type: TYPE_ENUM
-            predefined_type: "NfcEvent"
+            predefined_type: "::android::hardware::nfc::V1_0::NfcEvent"
         }
         arg: {
             type: TYPE_ENUM
-            predefined_type: "NfcStatus"
+            predefined_type: "::android::hardware::nfc::V1_0::NfcStatus"
         }
     }
 

nfc/1.0/vts/types.vts

diff --git a/nfc/1.0/vts/types.vts b/nfc/1.0/vts/types.vts
index 969a8af..e43db1e 100644
--- a/nfc/1.0/vts/types.vts
+++ b/nfc/1.0/vts/types.vts
@@ -4,8 +4,9 @@
 
 package: "android.hardware.nfc"
 
+
 attribute: {
-    name: "NfcEvent"
+    name: "::android::hardware::nfc::V1_0::NfcEvent"
     type: TYPE_ENUM
     enum_value: {
         scalar_type: "uint32_t"
@@ -42,7 +43,7 @@
 }
 
 attribute: {
-    name: "NfcStatus"
+    name: "::android::hardware::nfc::V1_0::NfcStatus"
     type: TYPE_ENUM
     enum_value: {
         scalar_type: "uint32_t"

vibrator/1.0/vts/Android.mk

diff --git a/vibrator/1.0/vts/Android.mk b/vibrator/1.0/vts/Android.mk
index cb70548..bdecb85 100644
--- a/vibrator/1.0/vts/Android.mk
+++ b/vibrator/1.0/vts/Android.mk
@@ -53,3 +53,34 @@
 LOCAL_MULTILIB := both
 
 include $(BUILD_SHARED_LIBRARY)
+
+# build profiler for vibrator.
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libvts_profiler_hidl_vibrator@1.0
+
+LOCAL_SRC_FILES := \
+   Vibrator.vts \
+   types.vts \
+
+LOCAL_C_INCLUDES += \
+  test/vts/drivers/libprofiling \
+
+LOCAL_VTS_MODE := PROFILER
+
+LOCAL_SHARED_LIBRARIES := \
+   android.hardware.vibrator@1.0 \
+   libbase \
+   libcutils \
+   liblog \
+   libhidl \
+   libhwbinder \
+   libprotobuf-cpp-full \
+   libvts_common \
+   libvts_multidevice_proto \
+   libvts_profiling \
+   libutils \
+
+LOCAL_PROTOC_OPTIMIZE_TYPE := full
+
+include $(BUILD_SHARED_LIBRARY)

vibrator/1.0/vts/Vibrator.vts

diff --git a/vibrator/1.0/vts/Vibrator.vts b/vibrator/1.0/vts/Vibrator.vts
index f1ab053..e0de3fb 100644
--- a/vibrator/1.0/vts/Vibrator.vts
+++ b/vibrator/1.0/vts/Vibrator.vts
@@ -11,7 +11,7 @@
         name: "on"
         return_type_hidl: {
             type: TYPE_ENUM
-            predefined_type: "Status"
+            predefined_type: "::android::hardware::vibrator::V1_0::Status"
         }
         arg: {
             type: TYPE_SCALAR
@@ -23,7 +23,7 @@
         name: "off"
         return_type_hidl: {
             type: TYPE_ENUM
-            predefined_type: "Status"
+            predefined_type: "::android::hardware::vibrator::V1_0::Status"
         }
     }
 

vibrator/1.0/vts/types.vts

diff --git a/vibrator/1.0/vts/types.vts b/vibrator/1.0/vts/types.vts
index 0eba051..d1bf1e1 100644
--- a/vibrator/1.0/vts/types.vts
+++ b/vibrator/1.0/vts/types.vts
@@ -6,7 +6,7 @@
 
 
 attribute: {
-    name: "Status"
+    name: "::android::hardware::vibrator::V1_0::Status"
     type: TYPE_ENUM
     enum_value: {
         scalar_type: "uint32_t"