diff --git a/universal7885-common/manifest.xml b/universal7885-common/manifest.xml index fc160ca..56586c7 100644 --- a/universal7885-common/manifest.xml +++ b/universal7885-common/manifest.xml @@ -241,13 +241,4 @@ imsd2 - - vendor.lineage.touch - hwbinder - 1.0 - - IGloveMode - default - - diff --git a/universal7885-common/power/Android.bp b/universal7885-common/power/Android.bp index 8d8d33e..b5e9d7c 100644 --- a/universal7885-common/power/Android.bp +++ b/universal7885-common/power/Android.bp @@ -31,7 +31,6 @@ cc_binary { "libhidlbase", "libutils", "android.hardware.power@1.0", - "vendor.lineage.power@1.0", ], static_libs: ["libc++fs"], diff --git a/universal7885-common/power/Power.cpp b/universal7885-common/power/Power.cpp index adc11a5..722e703 100644 --- a/universal7885-common/power/Power.cpp +++ b/universal7885-common/power/Power.cpp @@ -104,13 +104,6 @@ Return Power::powerHint(PowerHint hint, int32_t data) { initialize(); } - /* Bail out if low-power mode is active */ - if (current_profile == PowerProfile::POWER_SAVE && hint != PowerHint::LOW_POWER && - hint != static_cast(LineagePowerHint::SET_PROFILE)) { - LOG(VERBOSE) << "PROFILE_POWER_SAVE active, ignoring hint " << static_cast(hint); - return Void(); - } - switch (hint) { case PowerHint::INTERACTION: case PowerHint::LAUNCH: @@ -120,13 +113,6 @@ Return Power::powerHint(PowerHint hint, int32_t data) { setProfile(data ? PowerProfile::POWER_SAVE : PowerProfile::BALANCED); break; default: - if (hint == static_cast(LineagePowerHint::SET_PROFILE)) { - setProfile(static_cast(data)); - } else if (hint == static_cast(LineagePowerHint::CPU_BOOST)) { - sendBoost(data); - } else { - LOG(INFO) << "Unknown power hint: " << static_cast(hint); - } break; } return Void(); @@ -149,15 +135,6 @@ Return Power::getPlatformLowPowerStats(getPlatformLowPowerStats_cb _hidl_c return Void(); } -Return Power::getFeature(LineageFeature feature) { - switch (feature) { - case LineageFeature::SUPPORTED_PROFILES: - return static_cast(PowerProfile::MAX); - default: - return -1; - } -} - void Power::initialize() { findInputNodes(); diff --git a/universal7885-common/power/Power.h b/universal7885-common/power/Power.h index 2a8b8af..d8d4203 100644 --- a/universal7885-common/power/Power.h +++ b/universal7885-common/power/Power.h @@ -20,7 +20,6 @@ #include #include #include -#include namespace android { namespace hardware { @@ -36,10 +35,6 @@ using ::android::hardware::hidl_vec; using ::android::hardware::Return; using ::android::hardware::Void; -using ::vendor::lineage::power::V1_0::ILineagePower; -using ::vendor::lineage::power::V1_0::LineageFeature; -using ::vendor::lineage::power::V1_0::LineagePowerHint; - // clang-format off enum PowerProfile { POWER_SAVE = 0, @@ -49,14 +44,12 @@ enum PowerProfile { }; // clang-format on -struct Power : public IPower, public ILineagePower { +struct Power : public IPower { Return setInteractive(bool interactive) override; Return powerHint(PowerHint hint, int32_t data) override; Return setFeature(Feature feature, bool activate) override; Return getPlatformLowPowerStats(getPlatformLowPowerStats_cb _hidl_cb) override; - Return getFeature(LineageFeature feature) override; - private: void initialize(); void findInputNodes(); diff --git a/universal7885-common/power/service.cpp b/universal7885-common/power/service.cpp index db3f92d..21d7ef4 100644 --- a/universal7885-common/power/service.cpp +++ b/universal7885-common/power/service.cpp @@ -44,12 +44,6 @@ int main() { goto shutdown; } - status = power->ILineagePower::registerAsService(); - if (status != OK) { - LOG(ERROR) << "Could not register service (ILineagePower) for Power HAL"; - goto shutdown; - } - LOG(INFO) << "Power HAL service is Ready."; joinRpcThreadpool(); diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk index 9ab2878..05acf48 100644 --- a/universal7885-common/universal7885-common.mk +++ b/universal7885-common/universal7885-common.mk @@ -50,10 +50,6 @@ PRODUCT_PACKAGES += \ android.hardware.drm@1.0-service \ android.hardware.drm@1.3-service.clearkey -# FastCharge -PRODUCT_PACKAGES += \ - vendor.lineage.fastcharge@1.0-service.samsung - # Figerprint PRODUCT_PACKAGES += \ android.hardware.biometrics.fingerprint@2.1-service.samsung @@ -215,14 +211,6 @@ PRODUCT_PACKAGES += \ android.hardware.thermal@1.0-impl \ android.hardware.thermal@1.0-service -# Touch -PRODUCT_PACKAGES += \ - vendor.lineage.touch@1.0-service.samsung - -# Trust HAL -PRODUCT_PACKAGES += \ - vendor.lineage.trust@1.0-service - # USB PRODUCT_PACKAGES += \ android.hardware.usb@1.1-service.typec