commit 79c717d9bc82945967402e6d13041d41dd1fcf80
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 17 17:32:47 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 17 17:32:47 2016 +0000
tree ee22e542a885779ea2771f236c6f0a55d69745f5
parent 98cdbf0d2bc1892dfe1a2e7975b185d1b4710137
parent 5a9fe2ca6769e8ab68b40aee318042cabc5e81a6

Merge "Don't generate a Java Android.mk if we don't need to."

test/data/android/hardware/nfc/1.0/Nfc.vts

diff --git a/test/data/android/hardware/nfc/1.0/Nfc.vts b/test/data/android/hardware/nfc/1.0/Nfc.vts
index 03a5464..1f50698 100644
--- a/test/data/android/hardware/nfc/1.0/Nfc.vts
+++ b/test/data/android/hardware/nfc/1.0/Nfc.vts
@@ -28,13 +28,16 @@
             scalar_type: "int32_t"
         }
         arg: {
-            type: TYPE_STRUCT
-            predefined_type: "nfc_data_t"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
         }
     }
 
     api: {
-        name: "core_initialized"
+        name: "coreInitialized"
         return_type_hidl: {
             type: TYPE_SCALAR
             scalar_type: "int32_t"
@@ -49,7 +52,7 @@
     }
 
     api: {
-        name: "pre_discover"
+        name: "prediscover"
         return_type_hidl: {
             type: TYPE_SCALAR
             scalar_type: "int32_t"
@@ -65,7 +68,7 @@
     }
 
     api: {
-        name: "control_granted"
+        name: "controlGranted"
         return_type_hidl: {
             type: TYPE_SCALAR
             scalar_type: "int32_t"
@@ -73,7 +76,7 @@
     }
 
     api: {
-        name: "power_cycle"
+        name: "powerCycle"
         return_type_hidl: {
             type: TYPE_SCALAR
             scalar_type: "int32_t"

test/data/android/hardware/nfc/1.0/NfcClientCallback.vts

diff --git a/test/data/android/hardware/nfc/1.0/NfcClientCallback.vts b/test/data/android/hardware/nfc/1.0/NfcClientCallback.vts
index d69f26d..e2a3e5b 100644
--- a/test/data/android/hardware/nfc/1.0/NfcClientCallback.vts
+++ b/test/data/android/hardware/nfc/1.0/NfcClientCallback.vts
@@ -11,19 +11,22 @@
         name: "sendEvent"
         arg: {
             type: TYPE_ENUM
-            predefined_type: "nfc_event_t"
+            predefined_type: "NfcEvent"
         }
         arg: {
             type: TYPE_ENUM
-            predefined_type: "nfc_status_t"
+            predefined_type: "NfcStatus"
         }
     }
 
     api: {
         name: "sendData"
         arg: {
-            type: TYPE_STRUCT
-            predefined_type: "nfc_data_t"
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
         }
     }
 

test/data/android/hardware/nfc/1.0/types.vts

diff --git a/test/data/android/hardware/nfc/1.0/types.vts b/test/data/android/hardware/nfc/1.0/types.vts
index 3ea29af..8e4f93b 100644
--- a/test/data/android/hardware/nfc/1.0/types.vts
+++ b/test/data/android/hardware/nfc/1.0/types.vts
@@ -6,36 +6,36 @@
 
 
 attribute: {
-    name: "nfc_event_t"
+    name: "NfcEvent"
     type: TYPE_ENUM
     enum_value: {
         scalar_type: "uint32_t"
 
-        enumerator: "HAL_NFC_OPEN_CPLT_EVT"
+        enumerator: "OPEN_CPLT"
         scalar_value: {
             uint32_t: 0
         }
-        enumerator: "HAL_NFC_CLOSE_CPLT_EVT"
+        enumerator: "CLOSE_CPLT"
         scalar_value: {
             uint32_t: 1
         }
-        enumerator: "HAL_NFC_POST_INIT_CPLT_EVT"
+        enumerator: "POST_INIT_CPLT"
         scalar_value: {
             uint32_t: 2
         }
-        enumerator: "HAL_NFC_PRE_DISCOVER_CPLT_EVT"
+        enumerator: "PRE_DISCOVER_CPLT"
         scalar_value: {
             uint32_t: 3
         }
-        enumerator: "HAL_NFC_REQUEST_CONTROL_EVT"
+        enumerator: "REQUEST_CONTROL"
         scalar_value: {
             uint32_t: 4
         }
-        enumerator: "HAL_NFC_RELEASE_CONTROL_EVT"
+        enumerator: "RELEASE_CONTROL"
         scalar_value: {
             uint32_t: 5
         }
-        enumerator: "HAL_NFC_ERROR_EVT"
+        enumerator: "ERROR"
         scalar_value: {
             uint32_t: 6
         }
@@ -43,44 +43,31 @@
 }
 
 attribute: {
-    name: "nfc_status_t"
+    name: "NfcStatus"
     type: TYPE_ENUM
     enum_value: {
         scalar_type: "uint32_t"
 
-        enumerator: "HAL_NFC_STATUS_OK"
+        enumerator: "OK"
         scalar_value: {
             uint32_t: 0
         }
-        enumerator: "HAL_NFC_STATUS_FAILED"
+        enumerator: "FAILED"
         scalar_value: {
             uint32_t: 1
         }
-        enumerator: "HAL_NFC_STATUS_ERR_TRANSPORT"
+        enumerator: "ERR_TRANSPORT"
         scalar_value: {
             uint32_t: 2
         }
-        enumerator: "HAL_NFC_STATUS_ERR_CMD_TIMEOUT"
+        enumerator: "ERR_CMD_TIMEOUT"
         scalar_value: {
             uint32_t: 3
         }
-        enumerator: "HAL_NFC_STATUS_REFUSED"
+        enumerator: "REFUSED"
         scalar_value: {
             uint32_t: 4
         }
     }
 }
 
-attribute: {
-    name: "nfc_data_t"
-    type: TYPE_STRUCT
-    struct_value: {
-        name: "data"
-        type: TYPE_VECTOR
-        vector_value: {
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-}
-