Update .vts files on master based on the latest .hal file and hidl-gen

Test: mma
Change-Id: I9558f300505db83e26f7c241c5cf729cd005a07b

2 files changed, 0 insertions, 540 deletions

diff --git a/biometrics/fingerprint/2.1/vts/BiometricsFingerprint.vts b/biometrics/fingerprint/2.1/vts/BiometricsFingerprint.vts
index 475333ef0..0581da0b2 100644
--- a/biometrics/fingerprint/2.1/vts/BiometricsFingerprint.vts
+++ b/biometrics/fingerprint/2.1/vts/BiometricsFingerprint.vts
@@ -9,276 +9,6 @@ import: "android.hardware.biometrics.fingerprint@2.1::types"
 import: "android.hidl.base@1.0::types"
 
 interface: {
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::RequestStatus"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "SYS_UNKNOWN"
-            scalar_value: {
-                int32_t: 1
-            }
-            enumerator: "SYS_OK"
-            scalar_value: {
-                int32_t: 0
-            }
-            enumerator: "SYS_ENOENT"
-            scalar_value: {
-                int32_t: -2
-            }
-            enumerator: "SYS_EINTR"
-            scalar_value: {
-                int32_t: -4
-            }
-            enumerator: "SYS_EIO"
-            scalar_value: {
-                int32_t: -5
-            }
-            enumerator: "SYS_EAGAIN"
-            scalar_value: {
-                int32_t: -11
-            }
-            enumerator: "SYS_ENOMEM"
-            scalar_value: {
-                int32_t: -12
-            }
-            enumerator: "SYS_EACCES"
-            scalar_value: {
-                int32_t: -13
-            }
-            enumerator: "SYS_EFAULT"
-            scalar_value: {
-                int32_t: -14
-            }
-            enumerator: "SYS_EBUSY"
-            scalar_value: {
-                int32_t: -16
-            }
-            enumerator: "SYS_EINVAL"
-            scalar_value: {
-                int32_t: -22
-            }
-            enumerator: "SYS_ENOSPC"
-            scalar_value: {
-                int32_t: -28
-            }
-            enumerator: "SYS_ETIMEDOUT"
-            scalar_value: {
-                int32_t: -110
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintError"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "ERROR_NO_ERROR"
-            scalar_value: {
-                int32_t: 0
-            }
-            enumerator: "ERROR_HW_UNAVAILABLE"
-            scalar_value: {
-                int32_t: 1
-            }
-            enumerator: "ERROR_UNABLE_TO_PROCESS"
-            scalar_value: {
-                int32_t: 2
-            }
-            enumerator: "ERROR_TIMEOUT"
-            scalar_value: {
-                int32_t: 3
-            }
-            enumerator: "ERROR_NO_SPACE"
-            scalar_value: {
-                int32_t: 4
-            }
-            enumerator: "ERROR_CANCELED"
-            scalar_value: {
-                int32_t: 5
-            }
-            enumerator: "ERROR_UNABLE_TO_REMOVE"
-            scalar_value: {
-                int32_t: 6
-            }
-            enumerator: "ERROR_LOCKOUT"
-            scalar_value: {
-                int32_t: 7
-            }
-            enumerator: "ERROR_VENDOR"
-            scalar_value: {
-                int32_t: 8
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "ACQUIRED_GOOD"
-            scalar_value: {
-                int32_t: 0
-            }
-            enumerator: "ACQUIRED_PARTIAL"
-            scalar_value: {
-                int32_t: 1
-            }
-            enumerator: "ACQUIRED_INSUFFICIENT"
-            scalar_value: {
-                int32_t: 2
-            }
-            enumerator: "ACQUIRED_IMAGER_DIRTY"
-            scalar_value: {
-                int32_t: 3
-            }
-            enumerator: "ACQUIRED_TOO_SLOW"
-            scalar_value: {
-                int32_t: 4
-            }
-            enumerator: "ACQUIRED_TOO_FAST"
-            scalar_value: {
-                int32_t: 5
-            }
-            enumerator: "ACQUIRED_VENDOR"
-            scalar_value: {
-                int32_t: 6
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "gid"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "fid"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintEnroll"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "finger"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
-        }
-        struct_value: {
-            name: "samplesRemaining"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "msg"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintIterator"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "finger"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
-        }
-        struct_value: {
-            name: "remainingTemplates"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquired"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "acquiredInfo"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAuthenticated"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "finger"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
-        }
-        struct_value: {
-            name: "hat"
-            type: TYPE_ARRAY
-            vector_size: 69
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintMsgType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "ERROR"
-            scalar_value: {
-                int32_t: -1
-            }
-            enumerator: "ACQUIRED"
-            scalar_value: {
-                int32_t: 1
-            }
-            enumerator: "TEMPLATE_ENROLLING"
-            scalar_value: {
-                int32_t: 3
-            }
-            enumerator: "TEMPLATE_REMOVED"
-            scalar_value: {
-                int32_t: 4
-            }
-            enumerator: "AUTHENTICATED"
-            scalar_value: {
-                int32_t: 5
-            }
-            enumerator: "TEMPLATE_ENUMERATING"
-            scalar_value: {
-                int32_t: 6
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hidl::base::V1_0::DebugInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "pid"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "ptr"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
     api: {
         name: "setNotify"
         return_type_hidl: {
diff --git a/biometrics/fingerprint/2.1/vts/BiometricsFingerprintClientCallback.vts b/biometrics/fingerprint/2.1/vts/BiometricsFingerprintClientCallback.vts
index 7cf4003be..dedda65b5 100644
--- a/biometrics/fingerprint/2.1/vts/BiometricsFingerprintClientCallback.vts
+++ b/biometrics/fingerprint/2.1/vts/BiometricsFingerprintClientCallback.vts
@@ -8,276 +8,6 @@ import: "android.hardware.biometrics.fingerprint@2.1::types"
 import: "android.hidl.base@1.0::types"
 
 interface: {
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::RequestStatus"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "SYS_UNKNOWN"
-            scalar_value: {
-                int32_t: 1
-            }
-            enumerator: "SYS_OK"
-            scalar_value: {
-                int32_t: 0
-            }
-            enumerator: "SYS_ENOENT"
-            scalar_value: {
-                int32_t: -2
-            }
-            enumerator: "SYS_EINTR"
-            scalar_value: {
-                int32_t: -4
-            }
-            enumerator: "SYS_EIO"
-            scalar_value: {
-                int32_t: -5
-            }
-            enumerator: "SYS_EAGAIN"
-            scalar_value: {
-                int32_t: -11
-            }
-            enumerator: "SYS_ENOMEM"
-            scalar_value: {
-                int32_t: -12
-            }
-            enumerator: "SYS_EACCES"
-            scalar_value: {
-                int32_t: -13
-            }
-            enumerator: "SYS_EFAULT"
-            scalar_value: {
-                int32_t: -14
-            }
-            enumerator: "SYS_EBUSY"
-            scalar_value: {
-                int32_t: -16
-            }
-            enumerator: "SYS_EINVAL"
-            scalar_value: {
-                int32_t: -22
-            }
-            enumerator: "SYS_ENOSPC"
-            scalar_value: {
-                int32_t: -28
-            }
-            enumerator: "SYS_ETIMEDOUT"
-            scalar_value: {
-                int32_t: -110
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintError"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "ERROR_NO_ERROR"
-            scalar_value: {
-                int32_t: 0
-            }
-            enumerator: "ERROR_HW_UNAVAILABLE"
-            scalar_value: {
-                int32_t: 1
-            }
-            enumerator: "ERROR_UNABLE_TO_PROCESS"
-            scalar_value: {
-                int32_t: 2
-            }
-            enumerator: "ERROR_TIMEOUT"
-            scalar_value: {
-                int32_t: 3
-            }
-            enumerator: "ERROR_NO_SPACE"
-            scalar_value: {
-                int32_t: 4
-            }
-            enumerator: "ERROR_CANCELED"
-            scalar_value: {
-                int32_t: 5
-            }
-            enumerator: "ERROR_UNABLE_TO_REMOVE"
-            scalar_value: {
-                int32_t: 6
-            }
-            enumerator: "ERROR_LOCKOUT"
-            scalar_value: {
-                int32_t: 7
-            }
-            enumerator: "ERROR_VENDOR"
-            scalar_value: {
-                int32_t: 8
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "ACQUIRED_GOOD"
-            scalar_value: {
-                int32_t: 0
-            }
-            enumerator: "ACQUIRED_PARTIAL"
-            scalar_value: {
-                int32_t: 1
-            }
-            enumerator: "ACQUIRED_INSUFFICIENT"
-            scalar_value: {
-                int32_t: 2
-            }
-            enumerator: "ACQUIRED_IMAGER_DIRTY"
-            scalar_value: {
-                int32_t: 3
-            }
-            enumerator: "ACQUIRED_TOO_SLOW"
-            scalar_value: {
-                int32_t: 4
-            }
-            enumerator: "ACQUIRED_TOO_FAST"
-            scalar_value: {
-                int32_t: 5
-            }
-            enumerator: "ACQUIRED_VENDOR"
-            scalar_value: {
-                int32_t: 6
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "gid"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "fid"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintEnroll"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "finger"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
-        }
-        struct_value: {
-            name: "samplesRemaining"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "msg"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintIterator"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "finger"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
-        }
-        struct_value: {
-            name: "remainingTemplates"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquired"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "acquiredInfo"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAuthenticated"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "finger"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
-        }
-        struct_value: {
-            name: "hat"
-            type: TYPE_ARRAY
-            vector_size: 69
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintMsgType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "ERROR"
-            scalar_value: {
-                int32_t: -1
-            }
-            enumerator: "ACQUIRED"
-            scalar_value: {
-                int32_t: 1
-            }
-            enumerator: "TEMPLATE_ENROLLING"
-            scalar_value: {
-                int32_t: 3
-            }
-            enumerator: "TEMPLATE_REMOVED"
-            scalar_value: {
-                int32_t: 4
-            }
-            enumerator: "AUTHENTICATED"
-            scalar_value: {
-                int32_t: 5
-            }
-            enumerator: "TEMPLATE_ENUMERATING"
-            scalar_value: {
-                int32_t: 6
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hidl::base::V1_0::DebugInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "pid"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "ptr"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
     api: {
         name: "onEnrollResult"
         arg: {