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

Commit 832e7bd8 authored by Zhuoyao Zhang's avatar Zhuoyao Zhang Committed by android-build-merger
Browse files

Merge "Update vts files on aosp." am: 248e3932 

am: 848e5db5

Change-Id: Ie29071455c9ca3cf1a7293972347cbc6c9a9f9f1
parents 63ab2b31 848e5db5

bluetooth/1.0/vts/BluetoothHci.vts

+32 −6
Original line number Diff line number Diff line
@@ -6,18 +6,23 @@ package: "android.hardware.bluetooth" 


import: "android.hardware.bluetooth@1.0::IBluetoothHciCallbacks"

import: "android.hardware.bluetooth@1.0::types"

import: "android.hidl.base@1.0::types"



interface: {

    api: {

        name: "initialize"

        return_type_hidl: {

            type: TYPE_ENUM

            predefined_type: "::android::hardware::bluetooth::V1_0::Status"

        }

        arg: {

            type: TYPE_HIDL_INTERFACE

            predefined_type: "IBluetoothHciCallbacks"

            is_callback: false

            predefined_type: "::android::hardware::bluetooth::V1_0::IBluetoothHciCallbacks"

        }

        callflow: {

            entry: true

        }

        callflow: {

            next: "sendHciCommand"

            next: "sendAclData"

            next: "sendScoData"

            next: "close"

        }

    }
@@ -30,6 +35,12 @@ interface: { 
                scalar_type: "uint8_t"

            }

        }

        callflow: {

            next: "sendHciCommand"

            next: "sendAclData"

            next: "sendScoData"

            next: "close"

        }

    }



    api: {
@@ -41,6 +52,12 @@ interface: { 
                scalar_type: "uint8_t"

            }

        }

        callflow: {

            next: "sendHciCommand"

            next: "sendAclData"

            next: "sendScoData"

            next: "close"

        }

    }



    api: {
@@ -52,10 +69,19 @@ interface: { 
                scalar_type: "uint8_t"

            }

        }

        callflow: {

            next: "sendHciCommand"

            next: "sendAclData"

            next: "sendScoData"

            next: "close"

        }

    }



    api: {

        name: "close"

        callflow: {

            exit: true

        }

    }



}

bluetooth/1.0/vts/BluetoothHciCallbacks.vts

+9 −0
Original line number Diff line number Diff line
@@ -5,8 +5,17 @@ component_name: "IBluetoothHciCallbacks" 
package: "android.hardware.bluetooth"



import: "android.hardware.bluetooth@1.0::types"

import: "android.hidl.base@1.0::types"



interface: {

    api: {

        name: "initializationComplete"

        arg: {

            type: TYPE_ENUM

            predefined_type: "::android::hardware::bluetooth::V1_0::Status"

        }

    }



    api: {

        name: "hciEventReceived"

        arg: {

ir/1.0/vts/ConsumerIr.vts

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ component_name: "IConsumerIr" 
package: "android.hardware.ir"



import: "android.hardware.ir@1.0::types"

import: "android.hidl.base@1.0::types"



interface: {

    api: {

ir/1.0/vts/types.vts

+2 −1
Original line number Diff line number Diff line
@@ -19,3 +19,4 @@ attribute: { 
        scalar_type: "uint32_t"

    }

}

nfc/1.0/vts/Nfc.vts

+2 −26
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ package: "android.hardware.nfc" 


import: "android.hardware.nfc@1.0::INfcClientCallback"

import: "android.hardware.nfc@1.0::types"

import: "android.hidl.base@1.0::types"



interface: {

    api: {
@@ -16,8 +17,7 @@ interface: { 
        }

        arg: {

            type: TYPE_HIDL_CALLBACK

            predefined_type: "INfcClientCallback"

            is_callback: true

            predefined_type: "::android::hardware::nfc::V1_0::INfcClientCallback"

        }

        callflow: {

            entry: true
@@ -87,13 +87,6 @@ interface: { 
            next: "powerCycle"

            next: "controlGranted"

        }

        callflow: {

            next: "write"

            next: "close"

            next: "coreInitialized"

            next: "powerCycle"

            next: "controlGranted"

        }

    }



    api: {
@@ -105,9 +98,6 @@ interface: { 
        callflow: {

            exit: true

        }

        callflow: {

            exit: true

        }

    }



    api: {
@@ -123,13 +113,6 @@ interface: { 
            next: "coreInitialized"

            next: "powerCycle"

        }

        callflow: {

            next: "write"

            next: "close"

            next: "prediscover"

            next: "coreInitialized"

            next: "powerCycle"

        }

    }



    api: {
@@ -145,13 +128,6 @@ interface: { 
            next: "controlGranted"

            next: "close"

        }

        callflow: {

            next: "write"

            next: "coreInitialized"

            next: "prediscover"

            next: "controlGranted"

            next: "close"

        }

    }



}