Spacewar: Switch to common lights HAL
Change-Id: If515e7c3f6e5b6895076f1d8381fb2c22bd1b3de
This commit is contained in:
@@ -250,7 +250,7 @@ PRODUCT_SET_DEBUGFS_RESTRICTIONS := true
|
||||
|
||||
# Lights
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.lights-service.qti.nothing
|
||||
android.hardware.light-service.lineage
|
||||
|
||||
# Lineage Health
|
||||
PRODUCT_PACKAGES += \
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
cc_binary {
|
||||
name: "android.hardware.lights-service.qti.nothing",
|
||||
relative_install_path: "hw",
|
||||
init_rc: ["android.hardware.lights-qti.nothing.rc"],
|
||||
vintf_fragments: ["android.hardware.lights-qti.nothing.xml"],
|
||||
vendor: true,
|
||||
shared_libs: [
|
||||
"libbase",
|
||||
"liblog",
|
||||
"libhardware",
|
||||
"libbinder_ndk",
|
||||
"android.hardware.light-V2-ndk",
|
||||
],
|
||||
srcs: [
|
||||
"Lights.cpp",
|
||||
"main.cpp",
|
||||
],
|
||||
}
|
||||
@@ -1,119 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2019 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include "Lights.h"
|
||||
#include <android-base/logging.h>
|
||||
#include <log/log.h>
|
||||
|
||||
namespace aidl {
|
||||
namespace android {
|
||||
namespace hardware {
|
||||
namespace light {
|
||||
|
||||
const static std::map<LightType, const char*> kLogicalLights = {
|
||||
{LightType::BACKLIGHT, LIGHT_ID_BACKLIGHT},
|
||||
{LightType::KEYBOARD, LIGHT_ID_KEYBOARD},
|
||||
{LightType::BUTTONS, LIGHT_ID_BUTTONS},
|
||||
{LightType::BATTERY, LIGHT_ID_BATTERY},
|
||||
{LightType::NOTIFICATIONS, LIGHT_ID_NOTIFICATIONS},
|
||||
{LightType::ATTENTION, LIGHT_ID_ATTENTION},
|
||||
{LightType::BLUETOOTH, LIGHT_ID_BLUETOOTH},
|
||||
{LightType::WIFI, LIGHT_ID_WIFI}};
|
||||
|
||||
light_device_t* getLightDevice(const char* name) {
|
||||
light_device_t* lightDevice;
|
||||
const hw_module_t* hwModule = NULL;
|
||||
int ret = hw_get_module(LIGHTS_HARDWARE_MODULE_ID, &hwModule);
|
||||
if (ret == 0) {
|
||||
ret = hwModule->methods->open(hwModule, name,
|
||||
reinterpret_cast<hw_device_t**>(&lightDevice));
|
||||
if (ret != 0) {
|
||||
ALOGE("light_open %s %s failed: %d", LIGHTS_HARDWARE_MODULE_ID, name, ret);
|
||||
}
|
||||
} else {
|
||||
ALOGE("hw_get_module %s %s failed: %d", LIGHTS_HARDWARE_MODULE_ID, name, ret);
|
||||
}
|
||||
if (ret == 0) {
|
||||
return lightDevice;
|
||||
} else {
|
||||
ALOGE("Light passthrough failed to load legacy HAL.");
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
Lights::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) {
|
||||
HwLight hwLight{};
|
||||
hwLight.id = (int)type;
|
||||
hwLight.type = type;
|
||||
hwLight.ordinal = 0;
|
||||
lights[hwLight.id] = lightDevice;
|
||||
availableLights.emplace_back(hwLight);
|
||||
}
|
||||
}
|
||||
mAvailableLights = availableLights;
|
||||
mLights = lights;
|
||||
maxLights = lightCount;
|
||||
}
|
||||
|
||||
ndk::ScopedAStatus Lights::setLightState(int id, const HwLightState& state) {
|
||||
if (id >= maxLights) {
|
||||
ALOGE("Invalid Light id : %d", id);
|
||||
return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
|
||||
}
|
||||
auto it = mLights.find(id);
|
||||
if (it == mLights.end()) {
|
||||
ALOGE("Light not supported");
|
||||
return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
|
||||
}
|
||||
light_device_t* hwLight = it->second;
|
||||
light_state_t legacyState{
|
||||
.color = static_cast<unsigned int>(state.color),
|
||||
.flashMode = static_cast<int>(state.flashMode),
|
||||
.flashOnMS = state.flashOnMs,
|
||||
.flashOffMS = state.flashOffMs,
|
||||
.brightnessMode = static_cast<int>(state.brightnessMode),
|
||||
};
|
||||
int ret = hwLight->set_light(hwLight, &legacyState);
|
||||
switch (ret) {
|
||||
case -ENOSYS:
|
||||
return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION);
|
||||
case 0:
|
||||
return ndk::ScopedAStatus::ok();
|
||||
default:
|
||||
return ndk::ScopedAStatus::fromServiceSpecificError(ret);
|
||||
}
|
||||
}
|
||||
|
||||
ndk::ScopedAStatus Lights::getLights(std::vector<HwLight>* lights) {
|
||||
for (auto i = mAvailableLights.begin(); i != mAvailableLights.end(); i++) {
|
||||
lights->push_back(*i);
|
||||
}
|
||||
return ndk::ScopedAStatus::ok();
|
||||
}
|
||||
|
||||
} // namespace light
|
||||
} // namespace hardware
|
||||
} // namespace android
|
||||
} // namespace aidl
|
||||
@@ -1,44 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2020 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <aidl/android/hardware/light/BnLights.h>
|
||||
#include <hardware/hardware.h>
|
||||
#include <hardware/lights.h>
|
||||
#include <map>
|
||||
|
||||
namespace aidl {
|
||||
namespace android {
|
||||
namespace hardware {
|
||||
namespace light {
|
||||
|
||||
class Lights : public BnLights {
|
||||
public:
|
||||
Lights();
|
||||
ndk::ScopedAStatus setLightState(int id, const HwLightState& state) override;
|
||||
ndk::ScopedAStatus getLights(std::vector<HwLight>* types) override;
|
||||
|
||||
private:
|
||||
std::map<int, light_device_t*> mLights;
|
||||
std::vector<HwLight> mAvailableLights;
|
||||
int maxLights;
|
||||
};
|
||||
|
||||
} // namespace light
|
||||
} // namespace hardware
|
||||
} // namespace android
|
||||
} // namespace aidl
|
||||
@@ -1,5 +0,0 @@
|
||||
service vendor.light-qti /vendor/bin/hw/android.hardware.lights-service.qti.nothing
|
||||
class hal
|
||||
user system
|
||||
group system
|
||||
shutdown critical
|
||||
@@ -1,7 +0,0 @@
|
||||
<manifest version="1.0" type="device">
|
||||
<hal format="aidl">
|
||||
<name>android.hardware.light</name>
|
||||
<version>2</version>
|
||||
<fqname>ILights/default</fqname>
|
||||
</hal>
|
||||
</manifest>
|
||||
@@ -1,37 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2020 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <android-base/logging.h>
|
||||
#include <android/binder_manager.h>
|
||||
#include <android/binder_process.h>
|
||||
#include "Lights.h"
|
||||
|
||||
using ::aidl::android::hardware::light::Lights;
|
||||
|
||||
int main() {
|
||||
ABinderProcess_setThreadPoolMaxThreadCount(0);
|
||||
std::shared_ptr<Lights> lights = ndk::SharedRefBase::make<Lights>();
|
||||
if (!lights) {
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
const std::string instance = std::string() + Lights::descriptor + "/default";
|
||||
binder_status_t status = AServiceManager_addService(lights->asBinder().get(), instance.c_str());
|
||||
CHECK(status == STATUS_OK);
|
||||
|
||||
ABinderProcess_joinThreadPool();
|
||||
return EXIT_FAILURE; // should not reached
|
||||
}
|
||||
1
sepolicy/vendor/file_contexts
vendored
1
sepolicy/vendor/file_contexts
vendored
@@ -13,7 +13,6 @@
|
||||
|
||||
# HALs
|
||||
/vendor/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.3-service\.nothing u:object_r:hal_fingerprint_default_exec:s0
|
||||
/vendor/bin/hw/android\.hardware\.lights-service\.qti\.nothing u:object_r:hal_light_default_exec:s0
|
||||
/vendor/bin/hw/android\.hardware\.nfc-service\.nxp u:object_r:hal_nfc_default_exec:s0
|
||||
/vendor/bin/hw/vendor\.lineage\.powershare@1\.0-service\.nothing u:object_r:hal_lineage_powershare_default_exec:s0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user