From 5af46952b21359cd307b630d8d837edc4036c035 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Sun, 10 Nov 2019 17:56:28 -0800 Subject: [PATCH] Remove vibrator@1.4 Since this HAL was converted to AIDL. Bug: 141828236 Test: boot, use vibrator Change-Id: I0835dcecf7e6a3a4b5b01675df2a36ca8e6cd7a7 --- services/core/Android.bp | 2 +- .../com/android/server/VibratorService.java | 4 +-- services/core/jni/Android.bp | 1 - .../com_android_server_VibratorService.cpp | 32 +++---------------- 4 files changed, 7 insertions(+), 32 deletions(-) diff --git a/services/core/Android.bp b/services/core/Android.bp index a05c2cc31e40f..084a74724ad85 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -32,6 +32,7 @@ java_library_static { "android.hardware.power-V1.0-java", "android.hardware.tv.cec-V1.0-java", "app-compat-annotations", + "vintf-vibrator-java", ], required: [ @@ -50,7 +51,6 @@ java_library_static { "android.hardware.biometrics.fingerprint-V2.1-java", "android.hardware.oemlock-V1.0-java", "android.hardware.tetheroffload.control-V1.0-java", - "android.hardware.vibrator-V1.4-java", "android.hardware.configstore-V1.0-java", "android.hardware.contexthub-V1.0-java", "android.hidl.manager-V1.2-java", diff --git a/services/core/java/com/android/server/VibratorService.java b/services/core/java/com/android/server/VibratorService.java index d622fb433ed85..0db8495e9af98 100644 --- a/services/core/java/com/android/server/VibratorService.java +++ b/services/core/java/com/android/server/VibratorService.java @@ -28,8 +28,8 @@ import android.content.pm.PackageManager; import android.content.res.Resources; import android.database.ContentObserver; import android.hardware.input.InputManager; +import android.hardware.vibrator.IVibrator; import android.hardware.vibrator.V1_0.EffectStrength; -import android.hardware.vibrator.V1_4.Capabilities; import android.icu.text.DateFormat; import android.media.AudioAttributes; import android.media.AudioManager; @@ -1153,7 +1153,7 @@ public class VibratorService extends IVibratorService.Stub long duration = vibratorPerformEffect(prebaked.getId(), prebaked.getEffectStrength(), vib); long timeout = duration; - if ((mCapabilities & Capabilities.PERFORM_COMPLETION_CALLBACK) != 0) { + if ((mCapabilities & IVibrator.CAP_PERFORM_CALLBACK) != 0) { timeout *= ASYNC_TIMEOUT_MULTIPLIER; } if (timeout > 0) { diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp index 6175d41830202..7b3fbb97da56c 100644 --- a/services/core/jni/Android.bp +++ b/services/core/jni/Android.bp @@ -130,7 +130,6 @@ cc_defaults { "android.hardware.vibrator@1.1", "android.hardware.vibrator@1.2", "android.hardware.vibrator@1.3", - "android.hardware.vibrator@1.4", "android.hardware.vr@1.0", "android.frameworks.schedulerservice@1.0", "android.frameworks.sensorservice@1.0", diff --git a/services/core/jni/com_android_server_VibratorService.cpp b/services/core/jni/com_android_server_VibratorService.cpp index 4df5ba39669e6..746610df11ae5 100644 --- a/services/core/jni/com_android_server_VibratorService.cpp +++ b/services/core/jni/com_android_server_VibratorService.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "VibratorService" -#include +#include #include #include #include @@ -43,7 +43,6 @@ namespace V1_0 = android::hardware::vibrator::V1_0; namespace V1_1 = android::hardware::vibrator::V1_1; namespace V1_2 = android::hardware::vibrator::V1_2; namespace V1_3 = android::hardware::vibrator::V1_3; -namespace V1_4 = android::hardware::vibrator::V1_4; namespace aidl = android::hardware::vibrator; namespace android { @@ -78,11 +77,6 @@ static_assert(static_cast(V1_3::Effect::RINGTONE_15) == static_assert(static_cast(V1_3::Effect::TEXTURE_TICK) == static_cast(aidl::Effect::TEXTURE_TICK)); -static_assert(static_cast(V1_4::Capabilities::ON_COMPLETION_CALLBACK) == - static_cast(aidl::IVibrator::CAP_ON_CALLBACK)); -static_assert(static_cast(V1_4::Capabilities::PERFORM_COMPLETION_CALLBACK) == - static_cast(aidl::IVibrator::CAP_PERFORM_CALLBACK)); - class VibratorCallback { public: VibratorCallback(JNIEnv *env, jobject vibration) : @@ -102,20 +96,6 @@ class VibratorCallback { jobject mVibration; }; -class HidlVibratorCallback : public V1_4::IVibratorCallback { - public: - HidlVibratorCallback(JNIEnv *env, jobject vibration) : - mCb(env, vibration) {} - - Return onComplete() override { - mCb.onComplete(); - return Void(); - } - - private: - VibratorCallback mCb; -}; - class AidlVibratorCallback : public aidl::BnVibratorCallback { public: AidlVibratorCallback(JNIEnv *env, jobject vibration) : @@ -380,11 +360,7 @@ static jlong vibratorPerformEffect(JNIEnv* env, jclass, jlong effect, jlong stre EffectStrength effectStrength(static_cast(strength)); Return ret; - if (auto hal = getHal(); hal && isValidEffect(effect)) { - sp effectCallback = new HidlVibratorCallback(env, vibration); - ret = hal->call(&V1_4::IVibrator::perform_1_4, static_cast(effect), - effectStrength, effectCallback, callback); - } else if (isValidEffect(effect)) { + if (isValidEffect(effect)) { ret = halCall(&V1_0::IVibrator::perform, static_cast(effect), effectStrength, callback); } else if (isValidEffect(effect)) { @@ -429,9 +405,9 @@ static jlong vibratorGetCapabilities(JNIEnv*, jclass) { return 0; } return cap; - } else { - return halCall(&V1_4::IVibrator::getCapabilities).withDefault(0); } + + return 0; } static const JNINativeMethod method_table[] = {