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

Commit 5af46952 authored by Steven Moreland's avatar Steven Moreland
Browse files

Remove vibrator@1.4 

Since this HAL was converted to AIDL.

Bug: 141828236
Test: boot, use vibrator
Change-Id: I0835dcecf7e6a3a4b5b01675df2a36ca8e6cd7a7
parent 527ed44d

services/core/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ java_library_static { 
        "android.hardware.power-V1.0-java",

        "android.hardware.power-V1.0-java",

        "android.hardware.tv.cec-V1.0-java",

        "android.hardware.tv.cec-V1.0-java",

        "app-compat-annotations",

        "app-compat-annotations",

        "vintf-vibrator-java",

    ],

    ],





    required: [

    required: [
@@ -50,7 +51,6 @@ java_library_static { 
        "android.hardware.biometrics.fingerprint-V2.1-java",

        "android.hardware.biometrics.fingerprint-V2.1-java",

        "android.hardware.oemlock-V1.0-java",

        "android.hardware.oemlock-V1.0-java",

        "android.hardware.tetheroffload.control-V1.0-java",

        "android.hardware.tetheroffload.control-V1.0-java",

        "android.hardware.vibrator-V1.4-java",

        "android.hardware.configstore-V1.0-java",

        "android.hardware.configstore-V1.0-java",

        "android.hardware.contexthub-V1.0-java",

        "android.hardware.contexthub-V1.0-java",

        "android.hidl.manager-V1.2-java",

        "android.hidl.manager-V1.2-java",

services/core/java/com/android/server/VibratorService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -28,8 +28,8 @@ import android.content.pm.PackageManager; 
import android.content.res.Resources;

import android.content.res.Resources;

import android.database.ContentObserver;

import android.database.ContentObserver;

import android.hardware.input.InputManager;

import android.hardware.input.InputManager;

import android.hardware.vibrator.IVibrator;

import android.hardware.vibrator.V1_0.EffectStrength;

import android.hardware.vibrator.V1_0.EffectStrength;

import android.hardware.vibrator.V1_4.Capabilities;

import android.icu.text.DateFormat;

import android.icu.text.DateFormat;

import android.media.AudioAttributes;

import android.media.AudioAttributes;

import android.media.AudioManager;

import android.media.AudioManager;
@@ -1153,7 +1153,7 @@ public class VibratorService extends IVibratorService.Stub 
                long duration = vibratorPerformEffect(prebaked.getId(),

                long duration = vibratorPerformEffect(prebaked.getId(),

                        prebaked.getEffectStrength(), vib);

                        prebaked.getEffectStrength(), vib);

                long timeout = duration;

                long timeout = duration;

                if ((mCapabilities & Capabilities.PERFORM_COMPLETION_CALLBACK) != 0) {

                if ((mCapabilities & IVibrator.CAP_PERFORM_CALLBACK) != 0) {

                    timeout *= ASYNC_TIMEOUT_MULTIPLIER;

                    timeout *= ASYNC_TIMEOUT_MULTIPLIER;

                }

                }

                if (timeout > 0) {

                if (timeout > 0) {

services/core/jni/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -130,7 +130,6 @@ cc_defaults { 
        "android.hardware.vibrator@1.1",

        "android.hardware.vibrator@1.1",

        "android.hardware.vibrator@1.2",

        "android.hardware.vibrator@1.2",

        "android.hardware.vibrator@1.3",

        "android.hardware.vibrator@1.3",

        "android.hardware.vibrator@1.4",

        "android.hardware.vr@1.0",

        "android.hardware.vr@1.0",

        "android.frameworks.schedulerservice@1.0",

        "android.frameworks.schedulerservice@1.0",

        "android.frameworks.sensorservice@1.0",

        "android.frameworks.sensorservice@1.0",

services/core/jni/com_android_server_VibratorService.cpp

+4 −28
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 




#define LOG_TAG "VibratorService"

#define LOG_TAG "VibratorService"





#include <android/hardware/vibrator/1.4/IVibrator.h>

#include <android/hardware/vibrator/1.3/IVibrator.h>

#include <android/hardware/vibrator/BnVibratorCallback.h>

#include <android/hardware/vibrator/BnVibratorCallback.h>

#include <android/hardware/vibrator/IVibrator.h>

#include <android/hardware/vibrator/IVibrator.h>

#include <binder/IServiceManager.h>

#include <binder/IServiceManager.h>
@@ -43,7 +43,6 @@ namespace V1_0 = android::hardware::vibrator::V1_0; 
namespace V1_1 = android::hardware::vibrator::V1_1;

namespace V1_1 = android::hardware::vibrator::V1_1;

namespace V1_2 = android::hardware::vibrator::V1_2;

namespace V1_2 = android::hardware::vibrator::V1_2;

namespace V1_3 = android::hardware::vibrator::V1_3;

namespace V1_3 = android::hardware::vibrator::V1_3;

namespace V1_4 = android::hardware::vibrator::V1_4;

namespace aidl = android::hardware::vibrator;

namespace aidl = android::hardware::vibrator;





namespace android {

namespace android {
@@ -78,11 +77,6 @@ static_assert(static_cast<uint8_t>(V1_3::Effect::RINGTONE_15) == 
static_assert(static_cast<uint8_t>(V1_3::Effect::TEXTURE_TICK) ==

static_assert(static_cast<uint8_t>(V1_3::Effect::TEXTURE_TICK) ==

                static_cast<uint8_t>(aidl::Effect::TEXTURE_TICK));

                static_cast<uint8_t>(aidl::Effect::TEXTURE_TICK));





static_assert(static_cast<int32_t>(V1_4::Capabilities::ON_COMPLETION_CALLBACK) ==

                static_cast<int32_t>(aidl::IVibrator::CAP_ON_CALLBACK));

static_assert(static_cast<int32_t>(V1_4::Capabilities::PERFORM_COMPLETION_CALLBACK) ==

                static_cast<int32_t>(aidl::IVibrator::CAP_PERFORM_CALLBACK));



class VibratorCallback {

class VibratorCallback {

    public:

    public:

        VibratorCallback(JNIEnv *env, jobject vibration) :

        VibratorCallback(JNIEnv *env, jobject vibration) :
@@ -102,20 +96,6 @@ class VibratorCallback { 
        jobject mVibration;

        jobject mVibration;

};

};





class HidlVibratorCallback : public V1_4::IVibratorCallback {

  public:

    HidlVibratorCallback(JNIEnv *env, jobject vibration) :

    mCb(env, vibration) {}



    Return<void> onComplete() override {

        mCb.onComplete();

        return Void();

    }



  private:

    VibratorCallback mCb;

};



class AidlVibratorCallback : public aidl::BnVibratorCallback {

class AidlVibratorCallback : public aidl::BnVibratorCallback {

  public:

  public:

    AidlVibratorCallback(JNIEnv *env, jobject vibration) :

    AidlVibratorCallback(JNIEnv *env, jobject vibration) :
@@ -380,11 +360,7 @@ static jlong vibratorPerformEffect(JNIEnv* env, jclass, jlong effect, jlong stre 
        EffectStrength effectStrength(static_cast<EffectStrength>(strength));

        EffectStrength effectStrength(static_cast<EffectStrength>(strength));





        Return<void> ret;

        Return<void> ret;

        if (auto hal = getHal<V1_4::IVibrator>(); hal && isValidEffect<V1_3::Effect>(effect)) {

        if (isValidEffect<V1_0::Effect>(effect)) {

            sp<HidlVibratorCallback> effectCallback = new HidlVibratorCallback(env, vibration);

            ret = hal->call(&V1_4::IVibrator::perform_1_4, static_cast<V1_3::Effect>(effect),

                    effectStrength, effectCallback, callback);

        } else if (isValidEffect<V1_0::Effect>(effect)) {

            ret = halCall(&V1_0::IVibrator::perform, static_cast<V1_0::Effect>(effect),

            ret = halCall(&V1_0::IVibrator::perform, static_cast<V1_0::Effect>(effect),

                    effectStrength, callback);

                    effectStrength, callback);

        } else if (isValidEffect<Effect_1_1>(effect)) {

        } else if (isValidEffect<Effect_1_1>(effect)) {
@@ -429,9 +405,9 @@ static jlong vibratorGetCapabilities(JNIEnv*, jclass) { 
            return 0;

            return 0;

        }

        }

        return cap;

        return cap;

    } else {

        return halCall(&V1_4::IVibrator::getCapabilities).withDefault(0);

    }

    }



    return 0;

}

}





static const JNINativeMethod method_table[] = {

static const JNINativeMethod method_table[] = {