Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a0da2d1 authored by Zhuoyao Zhang's avatar Zhuoyao Zhang Committed by Android (Google) Code Review
Browse files

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

parents 260a5de3 0d0a5eab

nfc/1.0/vts/NfcClientCallback.vts

+2 −2
Original line number Diff line number Diff line
@@ -11,11 +11,11 @@ interface: { 
        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

+3 −2
Original line number Diff line number Diff line
@@ -4,8 +4,9 @@ component_name: "types" 


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: { 
}



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

+31 −0
Original line number Diff line number Diff line
@@ -53,3 +53,34 @@ LOCAL_PROTOC_OPTIMIZE_TYPE := full 
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

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ interface: { 
        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 @@ interface: { 
        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

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ package: "android.hardware.vibrator" 




attribute: {

    name: "Status"

    name: "::android::hardware::vibrator::V1_0::Status"

    type: TYPE_ENUM

    enum_value: {

        scalar_type: "uint32_t"