From d9b830ff9b4148cc4497b9d2b401a8285b7ffd58 Mon Sep 17 00:00:00 2001
From: Ruchi Kandoi <kandoiruchi@google.com>
Date: Mon, 21 Nov 2016 10:59:58 -0800
Subject: [PATCH] NFC: vts: Update VTS driver files as per HAL changes

The return types for the NFC HAL have changed, this patches updates the
VTS driver files.

Test: Test Passes
Bug: 32748647
Change-Id: Ic31d25c3d6b4a1db05e2e481a948a7547b30f2d7
Singed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
---
 nfc/1.0/vts/Nfc.vts | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/nfc/1.0/vts/Nfc.vts b/nfc/1.0/vts/Nfc.vts
index c2313d533f..5882bf51b1 100644
--- a/nfc/1.0/vts/Nfc.vts
+++ b/nfc/1.0/vts/Nfc.vts
@@ -11,8 +11,8 @@ interface: {
     api: {
         name: "open"
         return_type_hidl: {
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::nfc::V1_0::NfcStatus"
         }
         arg: {
             type: TYPE_HIDL_CALLBACK
@@ -35,7 +35,7 @@ interface: {
         name: "write"
         return_type_hidl: {
             type: TYPE_SCALAR
-            scalar_type: "int32_t"
+            scalar_type: "uint32_t"
         }
         arg: {
             type: TYPE_VECTOR
@@ -57,8 +57,8 @@ interface: {
     api: {
         name: "coreInitialized"
         return_type_hidl: {
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::nfc::V1_0::NfcStatus"
         }
         arg: {
             type: TYPE_VECTOR
@@ -77,8 +77,8 @@ interface: {
     api: {
         name: "prediscover"
         return_type_hidl: {
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::nfc::V1_0::NfcStatus"
         }
         callflow: {
             next: "write"
@@ -92,8 +92,8 @@ interface: {
     api: {
         name: "close"
         return_type_hidl: {
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::nfc::V1_0::NfcStatus"
         }
         callflow: {
             exit: true
@@ -103,8 +103,8 @@ interface: {
     api: {
         name: "controlGranted"
         return_type_hidl: {
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::nfc::V1_0::NfcStatus"
         }
         callflow: {
             next: "write"
@@ -118,8 +118,8 @@ interface: {
     api: {
         name: "powerCycle"
         return_type_hidl: {
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
+            type: TYPE_ENUM
+            predefined_type: "::android::hardware::nfc::V1_0::NfcStatus"
         }
         callflow: {
             next: "write"