diff --git a/vibrator/Android.bp b/vibrator/Android.bp index 0726454..8fe1d28 100644 --- a/vibrator/Android.bp +++ b/vibrator/Android.bp @@ -20,6 +20,6 @@ cc_binary { "libbase", "libbinder_ndk", "liblog", - "android.hardware.vibrator-V1-ndk", + "android.hardware.vibrator-V3-ndk", ], } diff --git a/vibrator/Vibrator.cpp b/vibrator/Vibrator.cpp index 22618d8..f1e322b 100644 --- a/vibrator/Vibrator.cpp +++ b/vibrator/Vibrator.cpp @@ -218,8 +218,70 @@ ndk::ScopedAStatus Vibrator::alwaysOnDisable(int32_t id __unused) { return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); } +ndk::ScopedAStatus Vibrator::getResonantFrequency(float* _aidl_return __unused) { + return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); +} + +ndk::ScopedAStatus Vibrator::getQFactor(float* _aidl_return __unused) { + return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); +} + +ndk::ScopedAStatus Vibrator::getFrequencyResolution(float* _aidl_return __unused) { + return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); +} + +ndk::ScopedAStatus Vibrator::getFrequencyMinimum(float* _aidl_return __unused) { + return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); +} + +ndk::ScopedAStatus Vibrator::getBandwidthAmplitudeMap(std::vector* _aidl_return __unused) { + return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); +} + +ndk::ScopedAStatus Vibrator::getPwlePrimitiveDurationMax(int32_t* _aidl_return __unused) { + return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); +} + +ndk::ScopedAStatus Vibrator::getPwleCompositionSizeMax(int32_t* _aidl_return __unused) { + return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); +} + +ndk::ScopedAStatus Vibrator::getSupportedBraking(std::vector<::aidl::android::hardware::vibrator::Braking>* _aidl_return __unused) { + return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); +} + +ndk::ScopedAStatus Vibrator::composePwle(const std::vector<::aidl::android::hardware::vibrator::PrimitivePwle>& in_composite __unused, + const std::shared_ptr<::aidl::android::hardware::vibrator::IVibratorCallback>& in_callback __unused) { + return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); +} + +ndk::ScopedAStatus Vibrator::performVendorEffect(const ::aidl::android::hardware::vibrator::VendorEffect& in_vendorEffect __unused, + const std::shared_ptr<::aidl::android::hardware::vibrator::IVibratorCallback>& in_callback __unused) { + return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); +} + +ndk::ScopedAStatus Vibrator::getFrequencyToOutputAccelerationMap(std::vector<::aidl::android::hardware::vibrator::FrequencyAccelerationMapEntry>* _aidl_return __unused) { + return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); +} + +ndk::ScopedAStatus Vibrator::getPwleV2PrimitiveDurationMaxMillis(int32_t* _aidl_return __unused) { + return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); +} + +ndk::ScopedAStatus Vibrator::getPwleV2CompositionSizeMax(int32_t* _aidl_return __unused) { + return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); +} + +ndk::ScopedAStatus Vibrator::getPwleV2PrimitiveDurationMinMillis(int32_t* _aidl_return __unused) { + return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); +} + +ndk::ScopedAStatus Vibrator::composePwleV2(const ::aidl::android::hardware::vibrator::CompositePwleV2& in_composite __unused, + const std::shared_ptr<::aidl::android::hardware::vibrator::IVibratorCallback>& in_callback __unused) { + return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); +} + } // namespace vibrator } // namespace hardware } // namespace android } // namespace aidl - diff --git a/vibrator/Vibrator.h b/vibrator/Vibrator.h index 91ac5f2..fbf449a 100644 --- a/vibrator/Vibrator.h +++ b/vibrator/Vibrator.h @@ -68,6 +68,26 @@ public: ndk::ScopedAStatus getSupportedAlwaysOnEffects(std::vector* _aidl_return) override; ndk::ScopedAStatus alwaysOnEnable(int32_t id, Effect effect, EffectStrength strength) override; ndk::ScopedAStatus alwaysOnDisable(int32_t id) override; + ndk::ScopedAStatus getResonantFrequency(float* _aidl_return) override; + ndk::ScopedAStatus getQFactor(float* _aidl_return) override; + ndk::ScopedAStatus getFrequencyResolution(float* _aidl_return) override; + ndk::ScopedAStatus getFrequencyMinimum(float* _aidl_return) override; + ndk::ScopedAStatus getBandwidthAmplitudeMap(std::vector* _aidl_return) override; + ndk::ScopedAStatus getPwlePrimitiveDurationMax(int32_t* _aidl_return) override; + ndk::ScopedAStatus getPwleCompositionSizeMax(int32_t* _aidl_return) override; + ndk::ScopedAStatus getSupportedBraking(std::vector<::aidl::android::hardware::vibrator::Braking>* _aidl_return) override; + ndk::ScopedAStatus composePwle(const std::vector<::aidl::android::hardware::vibrator::PrimitivePwle>& in_composite, + const std::shared_ptr& callback) override; + ndk::ScopedAStatus performVendorEffect(const ::aidl::android::hardware::vibrator::VendorEffect& effect, + const std::shared_ptr<::aidl::android::hardware::vibrator::IVibratorCallback>& callback) override; + + ndk::ScopedAStatus getFrequencyToOutputAccelerationMap(std::vector<::aidl::android::hardware::vibrator::FrequencyAccelerationMapEntry>* _aidl_return) override; + ndk::ScopedAStatus getPwleV2PrimitiveDurationMaxMillis(int32_t* _aidl_return) override; + ndk::ScopedAStatus getPwleV2CompositionSizeMax(int32_t* _aidl_return) override; + ndk::ScopedAStatus getPwleV2PrimitiveDurationMinMillis(int32_t* _aidl_return) override; + ndk::ScopedAStatus composePwleV2(const ::aidl::android::hardware::vibrator::CompositePwleV2& in_composite, + const std::shared_ptr& callback) override; + }; } // namespace vibrator