diff options
| -rw-r--r-- | base.mk | 9 | ||||
| -rw-r--r-- | lights/Lights.cpp | 24 | ||||
| -rw-r--r-- | lights/Lights.h | 3 |
3 files changed, 23 insertions, 13 deletions
@@ -67,7 +67,7 @@ BOARD_CHARGER_ENABLE_SUSPEND := true MSM_VIDC_TARGET_LIST := msm8974 msm8610 msm8226 apq8084 msm8916 msm8994 msm8909 msm8992 msm8996 msm8952 msm8937 msm8953 msm8998 apq8098_latv sdm660 sdm845 sdm710 qcs605 msmnile $(MSMSTEPPE) $(TRINKET) kona atoll lito #List of targets that use master side content protection -MASTER_SIDE_CP_TARGET_LIST := msm8996 msm8998 sdm660 sdm845 apq8098_latv sdm710 qcs605 msmnile $(MSMSTEPPE) $(TRINKET) kona lito atoll +MASTER_SIDE_CP_TARGET_LIST := msm8996 msm8998 sdm660 sdm845 apq8098_latv sdm710 qcs605 msmnile $(MSMSTEPPE) $(TRINKET) kona lito atoll holi bengal # Below projects/packages with LOCAL_MODULEs will be used by # PRODUCT_PACKAGES to build LOCAL_MODULEs that are tagged with @@ -826,6 +826,11 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.servicetracker@1.2-impl \ vendor.qti.hardware.servicetracker@1.2-service +#debugUtils +PRODUCT_PACKAGES_DEBUG += \ + vendor.qti.hardware.debugutils@1.0-impl \ + vendor.qti.hardware.debugutils@1.0-service + #debugApp FDA PRODUCT_PACKAGES += FDA PRODUCT_PACKAGES += debug.script.rc @@ -1095,6 +1100,8 @@ PRODUCT_PACKAGES += libqti_vndfwk_detect.vendor PRODUCT_PACKAGES += vndservicemanager PRODUCT_PACKAGES += vendor.qti.hardware.iop@2.0.vendor PRODUCT_PACKAGES += vendor.qti.hardware.perf@2.0.vendor +PRODUCT_PACKAGES += vendor.qti.hardware.perf@2.1.vendor +PRODUCT_PACKAGES += vendor.qti.hardware.perf@2.2.vendor #soong namespace for qssi vs vendor differentiation SOONG_CONFIG_NAMESPACES += qssi_vs_vendor diff --git a/lights/Lights.cpp b/lights/Lights.cpp index aa288b0..1e6f27b 100644 --- a/lights/Lights.cpp +++ b/lights/Lights.cpp @@ -56,32 +56,34 @@ light_device_t* getLightDevice(const char* name) { } Lights::Lights() { - std::map<LightType, light_device_t*> lights; + std::map<int, light_device_t*> lights; std::vector<HwLight> availableLights; + int lightCount =0; for(auto const &pair : kLogicalLights) { LightType type = pair.first; const char* name = pair.second; light_device_t* lightDevice = getLightDevice(name); + lightCount++; if (lightDevice != nullptr) { - lights[type] = lightDevice; + HwLight hwLight{}; + hwLight.id = (int)type; + hwLight.type = type; + hwLight.ordinal = 0; + lights[hwLight.id] = lightDevice; + availableLights.emplace_back(hwLight); } - HwLight hwLight{}; - hwLight.id = availableLights.size(); - hwLight.type = type; - hwLight.ordinal = 0; - availableLights.emplace_back(hwLight); } mAvailableLights = availableLights; mLights = lights; + maxLights = lightCount; } ndk::ScopedAStatus Lights::setLightState(int id, const HwLightState& state) { - if (id >= mAvailableLights.size()) { + if (id >= maxLights) { ALOGE("Invalid Light id : %d", id); - return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT); + return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); } - HwLight const& light = mAvailableLights[id]; - auto it = mLights.find(light.type); + auto it = mLights.find(id); if (it == mLights.end()) { ALOGE("Light not supported"); return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); diff --git a/lights/Lights.h b/lights/Lights.h index 879ea55..89d0cfe 100644 --- a/lights/Lights.h +++ b/lights/Lights.h @@ -33,8 +33,9 @@ class Lights : public BnLights { ndk::ScopedAStatus getLights(std::vector<HwLight>* types) override; private: - std::map<LightType, light_device_t*> mLights; + std::map<int, light_device_t*> mLights; std::vector<HwLight> mAvailableLights; + int maxLights; }; } // namespace light |