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

Commit dffa80bf authored by Lais Andrade's avatar Lais Andrade
Browse files

Removing Vibrator HIDL HAL support from frameworks 

Android Q is now no longer supported for launching or
upgrading devices in Android V so the vibrator HIDL HAL
versions no longer needs to be supported by the platform.

Bug: 308452413
Test: build
Flag: EXEMPT updating Android.bp and removing dependencies
Change-Id: I00e6cadb82bf590073314ab637838ce6fefc6306
parent f51c7e13

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

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ public class Watchdog implements Dumpable { 
            "android.hardware.sensors@1.0::ISensors",

            "android.hardware.sensors@2.0::ISensors",

            "android.hardware.sensors@2.1::ISensors",

            "android.hardware.vibrator@1.0::IVibrator",

            "android.hardware.vr@1.0::IVr",

            "android.system.suspend@1.0::ISystemSuspend"

    );

services/core/jni/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -193,10 +193,6 @@ cc_defaults { 
        "android.hardware.tv.input@1.0",

        "android.hardware.tv.input-V2-ndk",

        "android.hardware.vibrator-V3-ndk",

        "android.hardware.vibrator@1.0",

        "android.hardware.vibrator@1.1",

        "android.hardware.vibrator@1.2",

        "android.hardware.vibrator@1.3",

        "android.hardware.vr@1.0",

        "android.hidl.token@1.0-utils",

        "android.frameworks.schedulerservice@1.0",

services/core/jni/com_android_server_vibrator_VibratorController.cpp

+0 −28
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <aidl/android/hardware/vibrator/IVibrator.h>

#include <android/binder_parcel.h>

#include <android/binder_parcel_jni.h>

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

#include <android/persistable_bundle_aidl.h>

#include <android_os_vibrator.h>

#include <nativehelper/JNIHelp.h>
@@ -32,8 +31,6 @@ 
#include "core_jni_helpers.h"

#include "jni.h"



namespace V1_0 = android::hardware::vibrator::V1_0;

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

namespace Aidl = aidl::android::hardware::vibrator;



using aidl::android::os::PersistableBundle;
@@ -80,31 +77,6 @@ static struct { 
    jfieldID timeMillis;

} sPwlePointClassInfo;



static_assert(static_cast<uint8_t>(V1_0::EffectStrength::LIGHT) ==

              static_cast<uint8_t>(Aidl::EffectStrength::LIGHT));

static_assert(static_cast<uint8_t>(V1_0::EffectStrength::MEDIUM) ==

              static_cast<uint8_t>(Aidl::EffectStrength::MEDIUM));

static_assert(static_cast<uint8_t>(V1_0::EffectStrength::STRONG) ==

              static_cast<uint8_t>(Aidl::EffectStrength::STRONG));



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

              static_cast<uint8_t>(Aidl::Effect::CLICK));

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

              static_cast<uint8_t>(Aidl::Effect::DOUBLE_CLICK));

static_assert(static_cast<uint8_t>(V1_3::Effect::TICK) == static_cast<uint8_t>(Aidl::Effect::TICK));

static_assert(static_cast<uint8_t>(V1_3::Effect::THUD) == static_cast<uint8_t>(Aidl::Effect::THUD));

static_assert(static_cast<uint8_t>(V1_3::Effect::POP) == static_cast<uint8_t>(Aidl::Effect::POP));

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

              static_cast<uint8_t>(Aidl::Effect::HEAVY_CLICK));

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

              static_cast<uint8_t>(Aidl::Effect::RINGTONE_1));

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

              static_cast<uint8_t>(Aidl::Effect::RINGTONE_2));

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

              static_cast<uint8_t>(Aidl::Effect::RINGTONE_15));

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

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



static std::shared_ptr<vibrator::HalController> findVibrator(int32_t vibratorId) {

    vibrator::ManagerHalController* manager =

            android_server_vibrator_VibratorManagerService_getManager();