From e53d5db12026a4fb43d0acf9ca12133edd6d69e9 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Fri, 29 Apr 2022 16:18:14 +0900 Subject: [PATCH] universal7885: Remove LineageOS hardware samsung deps And track it with vendorsetup.sh --- .../hardware/samsung/fingerprint/Android.bp | 24 - .../fingerprint/BiometricsFingerprint.cpp | 539 ------------------ .../fingerprint/BiometricsFingerprint.h | 138 ----- .../samsung/fingerprint/VendorConstants.h | 104 ---- ...metrics.fingerprint@2.3-service.samsung.rc | 8 - ...etrics.fingerprint@2.3-service.samsung.xml | 11 - .../hardware/samsung/fingerprint/service.cpp | 53 -- .../bin/hardware/samsung/keymaster/Android.mk | 42 -- ....hardware.keymaster@4.0-service.samsung.rc | 8 - .../hardware/samsung/keymaster/service.cpp | 58 -- .../bin/hardware/samsung/light/Android.bp | 23 - .../bin/hardware/samsung/light/Lights.cpp | 196 ------- .../bin/hardware/samsung/light/Lights.h | 56 -- .../android.hardware.light-service.samsung.rc | 5 - ...android.hardware.light-service.samsung.xml | 6 - .../samsung/light/include/samsung_lights.h | 58 -- .../bin/hardware/samsung/light/service.cpp | 28 - .../samsung/power-libperfmgr/Android.bp | 38 -- .../power-libperfmgr/InteractionHandler.cpp | 265 --------- .../power-libperfmgr/InteractionHandler.h | 74 --- .../samsung/power-libperfmgr/Power.cpp | 262 --------- .../hardware/samsung/power-libperfmgr/Power.h | 61 -- .../samsung/power-libperfmgr/PowerExt.cpp | 90 --- .../samsung/power-libperfmgr/PowerExt.h | 56 -- ...rdware.power-service.samsung-libperfmgr.rc | 28 - ...android.hardware.power-service.samsung.xml | 6 - .../samsung/power-libperfmgr/service.cpp | 77 --- .../samsung/secril_config_svc/Android.bp | 24 - .../secril_config_svc/secril_config_svc.cpp | 71 --- .../bin/hardware/samsung/sensors/Android.bp | 20 - .../bin/hardware/samsung/sensors/Sensors.cpp | 366 ------------ .../bin/hardware/samsung/sensors/Sensors.h | 85 --- .../bin/hardware/samsung/vibrator/Android.bp | 22 - .../hardware/samsung/vibrator/Vibrator.cpp | 343 ----------- .../bin/hardware/samsung/vibrator/Vibrator.h | 95 --- ...droid.hardware.vibrator-service.samsung.rc | 10 - ...roid.hardware.vibrator-service.samsung.xml | 6 - .../bin/hardware/samsung/vibrator/service.cpp | 27 - .../samsung => }/camera/provider/Android.bp | 0 .../camera/provider/SamsungCameraProvider.cpp | 0 .../camera/provider/SamsungCameraProvider.h | 0 ....camera.provider@2.5-service.exynos7885.rc | 0 .../samsung => }/camera/provider/service.cpp | 0 .../{bin => }/eklogger/Android.bp | 0 .../{bin => }/eklogger/Logger.cpp | 0 .../{bin => }/eklogger/eklogger.rc | 0 .../{bin/hardware => }/interfaces/Android.bp | 0 .../hardware/fmradio/1.0/Android.bp | 0 .../hardware/fmradio/1.0/IFMRadio.hal | 0 .../interfaces/hardware/fmradio/1.0/types.hal | 0 .../hardware/fmradio/1.1/Android.bp | 0 .../hardware/fmradio/1.1/IFMRadio.hal | 0 .../interfaces/hardware/fmradio/1.1/types.hal | 0 .../hardware/fmradio/1.2/Android.bp | 0 .../hardware/fmradio/1.2/IFMRadio.hal | 0 .../hardware/fmradio/1.2/default/Android.bp | 0 .../hardware/fmradio/1.2/default/FMRadio.cpp | 0 .../hardware/fmradio/1.2/default/FMRadio.h | 0 .../hardware/fmradio/1.2/default/service.cpp | 0 ...dor.eureka.hardware.fmradio@1.2-service.rc | 0 .../vendor.eureka.hardware.fmradio@1.2.xml | 0 .../interfaces/hardware/fmradio/1.2/types.hal | 0 .../interfaces/hardware/parts/1.0/Android.bp | 0 .../hardware/parts/1.0/IBatteryStats.hal | 0 .../hardware/parts/1.0/IDisplayConfigs.hal | 0 .../hardware/parts/1.0/IFlashBrightness.hal | 0 .../hardware/parts/1.0/ISwapOnData.hal | 0 .../hardware/parts/1.0/default/Android.bp | 0 .../hardware/parts/1.0/default/Battery.cpp | 0 .../hardware/parts/1.0/default/Battery.h | 0 .../hardware/parts/1.0/default/Display.cpp | 0 .../hardware/parts/1.0/default/Display.h | 0 .../hardware/parts/1.0/default/FlashLight.cpp | 0 .../hardware/parts/1.0/default/FlashLight.h | 0 .../hardware/parts/1.0/default/Swap.cpp | 0 .../hardware/parts/1.0/default/Swap.h | 0 .../hardware/parts/1.0/default/service.cpp | 0 ...endor.eureka.hardware.parts@1.0-service.rc | 0 .../vendor.eureka.hardware.parts@1.0.xml | 0 .../interfaces/hardware/parts/1.0/types.hal | 0 .../{bin/init => libinit}/Android.bp | 0 .../init => libinit}/init_universal7885.cpp | 0 .../{bin => }/libshims/camera/Android.bp | 0 .../{bin => }/libshims/camera/CamDevice_3_2.h | 0 .../libshims/camera/CorrectCameraID.cpp | 0 .../libshims/sensor/ASensorManager.cpp | 0 .../{bin => }/libshims/sensor/Android.bp | 0 .../res/values/rom_strings.xml.template | 3 - .../samsung => }/usb/typeb/Android.bp | 0 .../hardware/samsung => }/usb/typeb/Usb.cpp | 0 .../hardware/samsung => }/usb/typeb/Usb.h | 0 .../android.hardware.usb@1.0-service.a10.rc | 0 .../android.hardware.usb@1.0-service.a10.xml | 0 .../samsung => }/usb/typeb/service.cpp | 0 .../samsung => }/usb/typec/Android.bp | 0 .../hardware/samsung => }/usb/typec/Usb.cpp | 0 .../hardware/samsung => }/usb/typec/Usb.h | 0 ...ndroid.hardware.usb@1.3-service.samsung.rc | 0 ...droid.hardware.usb@1.3-service.samsung.xml | 0 .../samsung => }/usb/typec/service.cpp | 0 universal7885-common/vendorsetup.sh | 4 +- 101 files changed, 3 insertions(+), 3387 deletions(-) delete mode 100644 universal7885-common/bin/hardware/samsung/fingerprint/Android.bp delete mode 100644 universal7885-common/bin/hardware/samsung/fingerprint/BiometricsFingerprint.cpp delete mode 100644 universal7885-common/bin/hardware/samsung/fingerprint/BiometricsFingerprint.h delete mode 100644 universal7885-common/bin/hardware/samsung/fingerprint/VendorConstants.h delete mode 100644 universal7885-common/bin/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc delete mode 100644 universal7885-common/bin/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml delete mode 100644 universal7885-common/bin/hardware/samsung/fingerprint/service.cpp delete mode 100644 universal7885-common/bin/hardware/samsung/keymaster/Android.mk delete mode 100644 universal7885-common/bin/hardware/samsung/keymaster/android.hardware.keymaster@4.0-service.samsung.rc delete mode 100644 universal7885-common/bin/hardware/samsung/keymaster/service.cpp delete mode 100644 universal7885-common/bin/hardware/samsung/light/Android.bp delete mode 100644 universal7885-common/bin/hardware/samsung/light/Lights.cpp delete mode 100644 universal7885-common/bin/hardware/samsung/light/Lights.h delete mode 100644 universal7885-common/bin/hardware/samsung/light/android.hardware.light-service.samsung.rc delete mode 100644 universal7885-common/bin/hardware/samsung/light/android.hardware.light-service.samsung.xml delete mode 100644 universal7885-common/bin/hardware/samsung/light/include/samsung_lights.h delete mode 100644 universal7885-common/bin/hardware/samsung/light/service.cpp delete mode 100644 universal7885-common/bin/hardware/samsung/power-libperfmgr/Android.bp delete mode 100644 universal7885-common/bin/hardware/samsung/power-libperfmgr/InteractionHandler.cpp delete mode 100644 universal7885-common/bin/hardware/samsung/power-libperfmgr/InteractionHandler.h delete mode 100644 universal7885-common/bin/hardware/samsung/power-libperfmgr/Power.cpp delete mode 100644 universal7885-common/bin/hardware/samsung/power-libperfmgr/Power.h delete mode 100644 universal7885-common/bin/hardware/samsung/power-libperfmgr/PowerExt.cpp delete mode 100644 universal7885-common/bin/hardware/samsung/power-libperfmgr/PowerExt.h delete mode 100644 universal7885-common/bin/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung-libperfmgr.rc delete mode 100644 universal7885-common/bin/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung.xml delete mode 100644 universal7885-common/bin/hardware/samsung/power-libperfmgr/service.cpp delete mode 100644 universal7885-common/bin/hardware/samsung/secril_config_svc/Android.bp delete mode 100644 universal7885-common/bin/hardware/samsung/secril_config_svc/secril_config_svc.cpp delete mode 100644 universal7885-common/bin/hardware/samsung/sensors/Android.bp delete mode 100644 universal7885-common/bin/hardware/samsung/sensors/Sensors.cpp delete mode 100644 universal7885-common/bin/hardware/samsung/sensors/Sensors.h delete mode 100644 universal7885-common/bin/hardware/samsung/vibrator/Android.bp delete mode 100644 universal7885-common/bin/hardware/samsung/vibrator/Vibrator.cpp delete mode 100644 universal7885-common/bin/hardware/samsung/vibrator/Vibrator.h delete mode 100644 universal7885-common/bin/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.rc delete mode 100644 universal7885-common/bin/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.xml delete mode 100644 universal7885-common/bin/hardware/samsung/vibrator/service.cpp rename universal7885-common/{bin/hardware/samsung => }/camera/provider/Android.bp (100%) rename universal7885-common/{bin/hardware/samsung => }/camera/provider/SamsungCameraProvider.cpp (100%) rename universal7885-common/{bin/hardware/samsung => }/camera/provider/SamsungCameraProvider.h (100%) rename universal7885-common/{bin/hardware/samsung => }/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc (100%) rename universal7885-common/{bin/hardware/samsung => }/camera/provider/service.cpp (100%) rename universal7885-common/{bin => }/eklogger/Android.bp (100%) rename universal7885-common/{bin => }/eklogger/Logger.cpp (100%) rename universal7885-common/{bin => }/eklogger/eklogger.rc (100%) rename universal7885-common/{bin/hardware => }/interfaces/Android.bp (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/fmradio/1.0/Android.bp (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/fmradio/1.0/IFMRadio.hal (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/fmradio/1.0/types.hal (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/fmradio/1.1/Android.bp (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/fmradio/1.1/IFMRadio.hal (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/fmradio/1.1/types.hal (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/fmradio/1.2/Android.bp (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/fmradio/1.2/IFMRadio.hal (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/fmradio/1.2/default/Android.bp (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/fmradio/1.2/default/FMRadio.cpp (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/fmradio/1.2/default/FMRadio.h (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/fmradio/1.2/default/service.cpp (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2.xml (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/fmradio/1.2/types.hal (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/Android.bp (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/IBatteryStats.hal (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/IDisplayConfigs.hal (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/IFlashBrightness.hal (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/ISwapOnData.hal (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/default/Android.bp (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/default/Battery.cpp (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/default/Battery.h (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/default/Display.cpp (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/default/Display.h (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/default/FlashLight.cpp (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/default/FlashLight.h (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/default/Swap.cpp (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/default/Swap.h (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/default/service.cpp (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0.xml (100%) rename universal7885-common/{bin/hardware => }/interfaces/hardware/parts/1.0/types.hal (100%) rename universal7885-common/{bin/init => libinit}/Android.bp (100%) rename universal7885-common/{bin/init => libinit}/init_universal7885.cpp (100%) rename universal7885-common/{bin => }/libshims/camera/Android.bp (100%) rename universal7885-common/{bin => }/libshims/camera/CamDevice_3_2.h (100%) rename universal7885-common/{bin => }/libshims/camera/CorrectCameraID.cpp (100%) rename universal7885-common/{bin => }/libshims/sensor/ASensorManager.cpp (100%) rename universal7885-common/{bin => }/libshims/sensor/Android.bp (100%) delete mode 100644 universal7885-common/overlay-rom/packages/apps/Settings/res/values/rom_strings.xml.template rename universal7885-common/{bin/hardware/samsung => }/usb/typeb/Android.bp (100%) rename universal7885-common/{bin/hardware/samsung => }/usb/typeb/Usb.cpp (100%) rename universal7885-common/{bin/hardware/samsung => }/usb/typeb/Usb.h (100%) rename universal7885-common/{bin/hardware/samsung => }/usb/typeb/android.hardware.usb@1.0-service.a10.rc (100%) rename universal7885-common/{bin/hardware/samsung => }/usb/typeb/android.hardware.usb@1.0-service.a10.xml (100%) rename universal7885-common/{bin/hardware/samsung => }/usb/typeb/service.cpp (100%) rename universal7885-common/{bin/hardware/samsung => }/usb/typec/Android.bp (100%) rename universal7885-common/{bin/hardware/samsung => }/usb/typec/Usb.cpp (100%) rename universal7885-common/{bin/hardware/samsung => }/usb/typec/Usb.h (100%) rename universal7885-common/{bin/hardware/samsung => }/usb/typec/android.hardware.usb@1.3-service.samsung.rc (100%) rename universal7885-common/{bin/hardware/samsung => }/usb/typec/android.hardware.usb@1.3-service.samsung.xml (100%) rename universal7885-common/{bin/hardware/samsung => }/usb/typec/service.cpp (100%) diff --git a/universal7885-common/bin/hardware/samsung/fingerprint/Android.bp b/universal7885-common/bin/hardware/samsung/fingerprint/Android.bp deleted file mode 100644 index 47d8c60..0000000 --- a/universal7885-common/bin/hardware/samsung/fingerprint/Android.bp +++ /dev/null @@ -1,24 +0,0 @@ -cc_binary { - name: "android.hardware.biometrics.fingerprint@2.3-service.samsung", - defaults: ["hidl_defaults"], - proprietary: true, - init_rc: ["android.hardware.biometrics.fingerprint@2.3-service.samsung.rc"], - vintf_fragments: ["android.hardware.biometrics.fingerprint@2.3-service.samsung.xml"], - relative_install_path: "hw", - cflags: ["-DHAS_FINGERPRINT_GESTURES"], - srcs: [ - "BiometricsFingerprint.cpp", - "service.cpp", - ], - shared_libs: [ - "liblog", - "libcutils", - "libhardware", - "libbase", - "libutils", - "libhidlbase", - "android.hardware.biometrics.fingerprint@2.1", - "android.hardware.biometrics.fingerprint@2.2", - "android.hardware.biometrics.fingerprint@2.3", - ], -} diff --git a/universal7885-common/bin/hardware/samsung/fingerprint/BiometricsFingerprint.cpp b/universal7885-common/bin/hardware/samsung/fingerprint/BiometricsFingerprint.cpp deleted file mode 100644 index eaec17b..0000000 --- a/universal7885-common/bin/hardware/samsung/fingerprint/BiometricsFingerprint.cpp +++ /dev/null @@ -1,539 +0,0 @@ -/* - * Copyright (C) 2019 The LineageOS 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. - */ -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.3-service.samsung" - -#include - -#include - -#include "BiometricsFingerprint.h" -#include -#include - -#include -#include -#include -#include - -#ifdef HAS_FINGERPRINT_GESTURES -#include -#endif - -namespace android { -namespace hardware { -namespace biometrics { -namespace fingerprint { -namespace V2_3 { -namespace implementation { - -using RequestStatus = - android::hardware::biometrics::fingerprint::V2_1::RequestStatus; - -BiometricsFingerprint *BiometricsFingerprint::sInstance = nullptr; - -BiometricsFingerprint::BiometricsFingerprint() : mClientCallback(nullptr) { - sInstance = this; // keep track of the most recent instance - if (!openHal()) { - LOG(ERROR) << "Can't open HAL module"; - } - -#ifdef HAS_FINGERPRINT_GESTURES - request(FINGERPRINT_REQUEST_NAVIGATION_MODE_START, 1); - - uinputFd = open("/dev/uinput", O_WRONLY | O_NONBLOCK); - if (uinputFd < 0) { - LOG(ERROR) << "Unable to open uinput node"; - return; - } - - int err = ioctl(uinputFd, UI_SET_EVBIT, EV_KEY) | - ioctl(uinputFd, UI_SET_KEYBIT, KEY_UP) | - ioctl(uinputFd, UI_SET_KEYBIT, KEY_DOWN); - if (err != 0) { - LOG(ERROR) << "Unable to enable key events"; - return; - } - - sprintf(uidev.name, "uinput-sec-fp"); - uidev.id.bustype = BUS_VIRTUAL; - - err = write(uinputFd, &uidev, sizeof(uidev)); - if (err < 0) { - LOG(ERROR) << "Write user device to uinput node failed"; - return; - } - - err = ioctl(uinputFd, UI_DEV_CREATE); - if (err < 0) { - LOG(ERROR) << "Unable to create uinput device"; - return; - } - - LOG(INFO) << "Successfully registered uinput-sec-fp for fingerprint gestures"; -#endif -} - -BiometricsFingerprint::~BiometricsFingerprint() { - if (ss_fingerprint_close() != 0) { - LOG(ERROR) << "Can't close HAL module"; - } -} - -Return BiometricsFingerprint::isUdfps(uint32_t) { - std::ifstream in("/sys/devices/virtual/fingerprint/fingerprint/position"); - if (in) { - in.close(); - return true; - } - return false; -} - -Return BiometricsFingerprint::onFingerDown(uint32_t, uint32_t, float, - float) { - return Void(); -} - -Return BiometricsFingerprint::onFingerUp() { return Void(); } - -Return BiometricsFingerprint::ErrorFilter(int32_t error) { - switch (error) { - case 0: - return RequestStatus::SYS_OK; - case -2: - return RequestStatus::SYS_ENOENT; - case -4: - return RequestStatus::SYS_EINTR; - case -5: - return RequestStatus::SYS_EIO; - case -11: - return RequestStatus::SYS_EAGAIN; - case -12: - return RequestStatus::SYS_ENOMEM; - case -13: - return RequestStatus::SYS_EACCES; - case -14: - return RequestStatus::SYS_EFAULT; - case -16: - return RequestStatus::SYS_EBUSY; - case -22: - return RequestStatus::SYS_EINVAL; - case -28: - return RequestStatus::SYS_ENOSPC; - case -110: - return RequestStatus::SYS_ETIMEDOUT; - default: - LOG(ERROR) << "An unknown error returned from fingerprint vendor library: " - << error; - return RequestStatus::SYS_UNKNOWN; - } -} - -// Translate from errors returned by traditional HAL (see fingerprint.h) to -// HIDL-compliant FingerprintError. -FingerprintError BiometricsFingerprint::VendorErrorFilter(int32_t error, - int32_t *vendorCode) { - *vendorCode = 0; - switch (error) { - case FINGERPRINT_ERROR_HW_UNAVAILABLE: - return FingerprintError::ERROR_HW_UNAVAILABLE; - case FINGERPRINT_ERROR_UNABLE_TO_PROCESS: - return FingerprintError::ERROR_UNABLE_TO_PROCESS; - case FINGERPRINT_ERROR_TIMEOUT: - return FingerprintError::ERROR_TIMEOUT; - case FINGERPRINT_ERROR_NO_SPACE: - return FingerprintError::ERROR_NO_SPACE; - case FINGERPRINT_ERROR_CANCELED: - return FingerprintError::ERROR_CANCELED; - case FINGERPRINT_ERROR_UNABLE_TO_REMOVE: - return FingerprintError::ERROR_UNABLE_TO_REMOVE; - case FINGERPRINT_ERROR_LOCKOUT: - return FingerprintError::ERROR_LOCKOUT; - default: - if (error >= FINGERPRINT_ERROR_VENDOR_BASE) { - // vendor specific code. - *vendorCode = error - FINGERPRINT_ERROR_VENDOR_BASE; - return FingerprintError::ERROR_VENDOR; - } - } - LOG(ERROR) << "Unknown error from fingerprint vendor library: " << error; - return FingerprintError::ERROR_UNABLE_TO_PROCESS; -} - -// Translate acquired messages returned by traditional HAL (see fingerprint.h) -// to HIDL-compliant FingerprintAcquiredInfo. -FingerprintAcquiredInfo -BiometricsFingerprint::VendorAcquiredFilter(int32_t info, int32_t *vendorCode) { - *vendorCode = 0; - switch (info) { - case FINGERPRINT_ACQUIRED_GOOD: - return FingerprintAcquiredInfo::ACQUIRED_GOOD; - case FINGERPRINT_ACQUIRED_PARTIAL: - return FingerprintAcquiredInfo::ACQUIRED_PARTIAL; - case FINGERPRINT_ACQUIRED_INSUFFICIENT: - return FingerprintAcquiredInfo::ACQUIRED_INSUFFICIENT; - case FINGERPRINT_ACQUIRED_IMAGER_DIRTY: - return FingerprintAcquiredInfo::ACQUIRED_IMAGER_DIRTY; - case FINGERPRINT_ACQUIRED_TOO_SLOW: - return FingerprintAcquiredInfo::ACQUIRED_TOO_SLOW; - case FINGERPRINT_ACQUIRED_TOO_FAST: - return FingerprintAcquiredInfo::ACQUIRED_TOO_FAST; - default: - if (info >= FINGERPRINT_ACQUIRED_VENDOR_BASE) { - // vendor specific code. - *vendorCode = info - FINGERPRINT_ACQUIRED_VENDOR_BASE; - return FingerprintAcquiredInfo::ACQUIRED_VENDOR; - } - } - LOG(ERROR) << "Unknown acquiredmsg from fingerprint vendor library: " << info; - return FingerprintAcquiredInfo::ACQUIRED_INSUFFICIENT; -} - -Return BiometricsFingerprint::setNotify( - const sp &clientCallback) { - std::lock_guard lock(mClientCallbackMutex); - mClientCallback = clientCallback; - // This is here because HAL 2.3 doesn't have a way to propagate a - // unique token for its driver. Subsequent versions should send a unique - // token for each call to setNotify(). This is fine as long as there's only - // one fingerprint device on the platform. - return reinterpret_cast(this); -} - -Return BiometricsFingerprint::preEnroll() { - return ss_fingerprint_pre_enroll(); -} - -Return -BiometricsFingerprint::enroll(const hidl_array &hat, uint32_t gid, - uint32_t timeoutSec) { - const hw_auth_token_t *authToken = - reinterpret_cast(hat.data()); - - return ErrorFilter(ss_fingerprint_enroll(authToken, gid, timeoutSec)); -} - -Return BiometricsFingerprint::postEnroll() { - return ErrorFilter(ss_fingerprint_post_enroll()); -} - -Return BiometricsFingerprint::getAuthenticatorId() { - return ss_fingerprint_get_auth_id(); -} - -Return BiometricsFingerprint::cancel() { - int32_t ret = ss_fingerprint_cancel(); - -#ifdef CALL_NOTIFY_ON_CANCEL - if (ret == 0) { - fingerprint_msg_t msg{}; - msg.type = FINGERPRINT_ERROR; - msg.data.error = FINGERPRINT_ERROR_CANCELED; - notify(&msg); - } -#endif - - return ErrorFilter(ret); -} - -Return BiometricsFingerprint::enumerate() { - if (ss_fingerprint_enumerate != nullptr) { - return ErrorFilter(ss_fingerprint_enumerate()); - } - - return RequestStatus::SYS_UNKNOWN; -} - -Return BiometricsFingerprint::remove(uint32_t gid, - uint32_t fid) { - return ErrorFilter(ss_fingerprint_remove(gid, fid)); -} - -Return -BiometricsFingerprint::setActiveGroup(uint32_t gid, - const hidl_string &storePath) { - if (storePath.size() >= PATH_MAX || storePath.size() <= 0) { - LOG(ERROR) << "Bad path length: " << storePath.size(); - return RequestStatus::SYS_EINVAL; - } - - if (access(storePath.c_str(), W_OK)) { - return RequestStatus::SYS_EINVAL; - } - - return ErrorFilter(ss_fingerprint_set_active_group(gid, storePath.c_str())); -} - -Return BiometricsFingerprint::authenticate(uint64_t operationId, - uint32_t gid) { - return ErrorFilter(ss_fingerprint_authenticate(operationId, gid)); -} - -IBiometricsFingerprint *BiometricsFingerprint::getInstance() { - if (!sInstance) { - sInstance = new BiometricsFingerprint(); - } - return sInstance; -} - -bool BiometricsFingerprint::openHal() { - void *handle = dlopen("libbauthserver.so", RTLD_NOW); - if (handle) { - int err; - - ss_fingerprint_close = reinterpret_cast( - dlsym(handle, "ss_fingerprint_close")); - ss_fingerprint_open = reinterpret_cast( - dlsym(handle, "ss_fingerprint_open")); - - ss_set_notify_callback = reinterpret_cast( - dlsym(handle, "ss_set_notify_callback")); - ss_fingerprint_pre_enroll = - reinterpret_cast( - dlsym(handle, "ss_fingerprint_pre_enroll")); - ss_fingerprint_enroll = reinterpret_cast( - dlsym(handle, "ss_fingerprint_enroll")); - ss_fingerprint_post_enroll = - reinterpret_cast( - dlsym(handle, "ss_fingerprint_post_enroll")); - ss_fingerprint_get_auth_id = - reinterpret_cast( - dlsym(handle, "ss_fingerprint_get_auth_id")); - ss_fingerprint_cancel = reinterpret_cast( - dlsym(handle, "ss_fingerprint_cancel")); - ss_fingerprint_enumerate = - reinterpret_cast( - dlsym(handle, "ss_fingerprint_enumerate")); - ss_fingerprint_remove = reinterpret_cast( - dlsym(handle, "ss_fingerprint_remove")); - ss_fingerprint_set_active_group = - reinterpret_cast( - dlsym(handle, "ss_fingerprint_set_active_group")); - ss_fingerprint_authenticate = - reinterpret_cast( - dlsym(handle, "ss_fingerprint_authenticate")); - ss_fingerprint_request = reinterpret_cast( - dlsym(handle, "ss_fingerprint_request")); - - if ((err = ss_fingerprint_open(nullptr)) != 0) { - LOG(ERROR) << "Can't open fingerprint, error: " << err; - return false; - } - - if ((err = ss_set_notify_callback(BiometricsFingerprint::notify)) != 0) { - LOG(ERROR) << "Can't register fingerprint module callback, error: " - << err; - return false; - } - - return true; - } - - return false; -} - -void BiometricsFingerprint::notify(const fingerprint_msg_t *msg) { - BiometricsFingerprint *thisPtr = static_cast( - BiometricsFingerprint::getInstance()); - std::lock_guard lock(thisPtr->mClientCallbackMutex); - if (thisPtr == nullptr || thisPtr->mClientCallback == nullptr) { - LOG(ERROR) - << "Receiving callbacks before the client callback is registered."; - return; - } - const uint64_t devId = 1; - switch (msg->type) { - case FINGERPRINT_ERROR: { - int32_t vendorCode = 0; - FingerprintError result = VendorErrorFilter(msg->data.error, &vendorCode); - LOG(DEBUG) << "onError(" << static_cast(result) << ")"; - if (!thisPtr->mClientCallback->onError(devId, result, vendorCode).isOk()) { - LOG(ERROR) << "failed to invoke fingerprint onError callback"; - } - } break; - case FINGERPRINT_ACQUIRED: { - if (msg->data.acquired.acquired_info > SEM_FINGERPRINT_EVENT_BASE) { - thisPtr->handleEvent(msg->data.acquired.acquired_info); - return; - } - int32_t vendorCode = 0; - FingerprintAcquiredInfo result = - VendorAcquiredFilter(msg->data.acquired.acquired_info, &vendorCode); - LOG(DEBUG) << "onAcquired(" << static_cast(result) << ")"; - if (!thisPtr->mClientCallback->onAcquired(devId, result, vendorCode) - .isOk()) { - LOG(ERROR) << "failed to invoke fingerprint onAcquired callback"; - } - } break; - case FINGERPRINT_TEMPLATE_ENROLLING: -#ifdef USES_PERCENTAGE_SAMPLES - const_cast(msg)->data.enroll.samples_remaining = - 100 - msg->data.enroll.samples_remaining; -#endif -#ifdef CALL_CANCEL_ON_ENROLL_COMPLETION - if (msg->data.enroll.samples_remaining == 0) { - thisPtr->ss_fingerprint_cancel(); - } -#endif - LOG(DEBUG) << "onEnrollResult(fid=" << msg->data.enroll.finger.fid - << ", gid=" << msg->data.enroll.finger.gid - << ", rem=" << msg->data.enroll.samples_remaining << ")"; - if (!thisPtr->mClientCallback - ->onEnrollResult(devId, msg->data.enroll.finger.fid, - msg->data.enroll.finger.gid, - msg->data.enroll.samples_remaining) - .isOk()) { - LOG(ERROR) << "failed to invoke fingerprint onEnrollResult callback"; - } - break; - case FINGERPRINT_TEMPLATE_REMOVED: - LOG(DEBUG) << "onRemove(fid=" << msg->data.removed.finger.fid - << ", gid=" << msg->data.removed.finger.gid - << ", rem=" << msg->data.removed.remaining_templates << ")"; - if (!thisPtr->mClientCallback - ->onRemoved(devId, msg->data.removed.finger.fid, - msg->data.removed.finger.gid, - msg->data.removed.remaining_templates) - .isOk()) { - LOG(ERROR) << "failed to invoke fingerprint onRemoved callback"; - } - break; - case FINGERPRINT_AUTHENTICATED: - LOG(DEBUG) << "onAuthenticated(fid=" << msg->data.authenticated.finger.fid - << ", gid=" << msg->data.authenticated.finger.gid << ")"; - if (msg->data.authenticated.finger.fid != 0) { - const uint8_t *hat = - reinterpret_cast(&msg->data.authenticated.hat); - const hidl_vec token( - std::vector(hat, hat + sizeof(msg->data.authenticated.hat))); - if (!thisPtr->mClientCallback - ->onAuthenticated(devId, msg->data.authenticated.finger.fid, - msg->data.authenticated.finger.gid, token) - .isOk()) { - LOG(ERROR) << "failed to invoke fingerprint onAuthenticated callback"; - } - } else { - // Not a recognized fingerprint - if (!thisPtr->mClientCallback - ->onAuthenticated(devId, msg->data.authenticated.finger.fid, - msg->data.authenticated.finger.gid, - hidl_vec()) - .isOk()) { - LOG(ERROR) << "failed to invoke fingerprint onAuthenticated callback"; - } - } - break; - case FINGERPRINT_TEMPLATE_ENUMERATING: - LOG(DEBUG) << "onEnumerate(fid=" << msg->data.enumerated.finger.fid - << ", gid=" << msg->data.enumerated.finger.gid - << ", rem=" << msg->data.enumerated.remaining_templates << ")"; - if (!thisPtr->mClientCallback - ->onEnumerate(devId, msg->data.enumerated.finger.fid, - msg->data.enumerated.finger.gid, - msg->data.enumerated.remaining_templates) - .isOk()) { - LOG(ERROR) << "failed to invoke fingerprint onEnumerate callback"; - } - break; - } -} - -void BiometricsFingerprint::handleEvent(int eventCode) { - switch (eventCode) { -#ifdef HAS_FINGERPRINT_GESTURES - case SEM_FINGERPRINT_EVENT_GESTURE_SWIPE_DOWN: - case SEM_FINGERPRINT_EVENT_GESTURE_SWIPE_UP: - struct input_event event {}; - int keycode = - eventCode == SEM_FINGERPRINT_EVENT_GESTURE_SWIPE_UP ? KEY_UP : KEY_DOWN; - int err; - - // Report the key - event.type = EV_KEY; - event.code = keycode; - event.value = 1; - err = write(uinputFd, &event, sizeof(event)); - if (err < 0) { - LOG(ERROR) << "Write EV_KEY to uinput node failed"; - return; - } - - // Force a flush with an EV_SYN - event.type = EV_SYN; - event.code = SYN_REPORT; - event.value = 0; - err = write(uinputFd, &event, sizeof(event)); - if (err < 0) { - LOG(ERROR) << "Write EV_SYN to uinput node failed"; - return; - } - - // Report the key - event.type = EV_KEY; - event.code = keycode; - event.value = 0; - err = write(uinputFd, &event, sizeof(event)); - if (err < 0) { - LOG(ERROR) << "Write EV_KEY to uinput node failed"; - return; - } - - // Force a flush with an EV_SYN - event.type = EV_SYN; - event.code = SYN_REPORT; - event.value = 0; - err = write(uinputFd, &event, sizeof(event)); - if (err < 0) { - LOG(ERROR) << "Write EV_SYN to uinput node failed"; - return; - } - break; -#endif - } -} - -int BiometricsFingerprint::request(int cmd, int param) { - // TO-DO: input, output handling not implemented - int result = ss_fingerprint_request(cmd, nullptr, 0, nullptr, 0, param); - LOG(INFO) << "request(cmd=" << cmd << ", param=" << param - << ", result=" << result << ")"; - return result; -} - -int BiometricsFingerprint::waitForSensor(std::chrono::milliseconds pollWait, - std::chrono::milliseconds timeOut) { - int sensorStatus = SEM_SENSOR_STATUS_WORKING; - std::chrono::milliseconds timeWaited = 0ms; - while (sensorStatus != SEM_SENSOR_STATUS_OK) { - if (sensorStatus == SEM_SENSOR_STATUS_CALIBRATION_ERROR || - sensorStatus == SEM_SENSOR_STATUS_ERROR) { - return -1; - } - if (timeWaited >= timeOut) { - return -2; - } - sensorStatus = request(FINGERPRINT_REQUEST_GET_SENSOR_STATUS, 0); - std::this_thread::sleep_for(pollWait); - timeWaited += pollWait; - } - return 0; -} - -} // namespace implementation -} // namespace V2_3 -} // namespace fingerprint -} // namespace biometrics -} // namespace hardware -} // namespace android diff --git a/universal7885-common/bin/hardware/samsung/fingerprint/BiometricsFingerprint.h b/universal7885-common/bin/hardware/samsung/fingerprint/BiometricsFingerprint.h deleted file mode 100644 index 60ccd1d..0000000 --- a/universal7885-common/bin/hardware/samsung/fingerprint/BiometricsFingerprint.h +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright (C) 2019 The LineageOS 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. - */ - -#ifndef ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_3_BIOMETRICSFINGERPRINT_H -#define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_3_BIOMETRICSFINGERPRINT_H - -#include -#include - -#ifdef HAS_FINGERPRINT_GESTURES -#include -#endif - -#include -#include -#include -#include -#include -#include - -#include "VendorConstants.h" - -namespace android { -namespace hardware { -namespace biometrics { -namespace fingerprint { -namespace V2_3 { -namespace implementation { - -using namespace std::chrono_literals; - -using ::android::sp; -using ::android::hardware::hidl_string; -using ::android::hardware::hidl_vec; -using ::android::hardware::Return; -using ::android::hardware::Void; -using ::android::hardware::biometrics::fingerprint::V2_1:: - FingerprintAcquiredInfo; -using ::android::hardware::biometrics::fingerprint::V2_1::FingerprintError; -using ::android::hardware::biometrics::fingerprint::V2_1:: - IBiometricsFingerprintClientCallback; -using ::android::hardware::biometrics::fingerprint::V2_1::RequestStatus; -using ::android::hardware::biometrics::fingerprint::V2_3:: - IBiometricsFingerprint; - -struct BiometricsFingerprint : public IBiometricsFingerprint { - BiometricsFingerprint(); - ~BiometricsFingerprint(); - - // Method to wrap legacy HAL with BiometricsFingerprint class - static IBiometricsFingerprint *getInstance(); - - // Methods from - // ::android::hardware::biometrics::fingerprint::V2_3::IBiometricsFingerprint - // follow. - Return setNotify( - const sp &clientCallback) override; - Return preEnroll() override; - Return enroll(const hidl_array &hat, uint32_t gid, - uint32_t timeoutSec) override; - Return postEnroll() override; - Return getAuthenticatorId() override; - Return cancel() override; - Return enumerate() override; - Return remove(uint32_t gid, uint32_t fid) override; - Return setActiveGroup(uint32_t gid, - const hidl_string &storePath) override; - Return authenticate(uint64_t operationId, - uint32_t gid) override; - Return isUdfps(uint32_t sensorID) override; - Return onFingerDown(uint32_t x, uint32_t y, float minor, - float major) override; - Return onFingerUp() override; - Return onShowUdfpsOverlay() { return Void(); } - Return onHideUdfpsOverlay() { return Void(); } - -private: - bool openHal(); - int request(int cmd, int param); - int waitForSensor(std::chrono::milliseconds pollWait, - std::chrono::milliseconds timeOut); - static void - notify(const fingerprint_msg_t - *msg); /* Static callback for legacy HAL implementation */ - void handleEvent(int eventCode); - static Return ErrorFilter(int32_t error); - static FingerprintError VendorErrorFilter(int32_t error, int32_t *vendorCode); - static FingerprintAcquiredInfo VendorAcquiredFilter(int32_t error, - int32_t *vendorCode); - static BiometricsFingerprint *sInstance; - - std::mutex mClientCallbackMutex; - sp mClientCallback; -#ifdef HAS_FINGERPRINT_GESTURES - int uinputFd; - struct uinput_user_dev uidev {}; -#endif - - int (*ss_fingerprint_close)(); - int (*ss_fingerprint_open)(const char *id); - - int (*ss_set_notify_callback)(fingerprint_notify_t notify); - uint64_t (*ss_fingerprint_pre_enroll)(); - int (*ss_fingerprint_enroll)(const hw_auth_token_t *hat, uint32_t gid, - uint32_t timeout_sec); - int (*ss_fingerprint_post_enroll)(); - uint64_t (*ss_fingerprint_get_auth_id)(); - int (*ss_fingerprint_cancel)(); - int (*ss_fingerprint_enumerate)(); - int (*ss_fingerprint_remove)(uint32_t gid, uint32_t fid); - int (*ss_fingerprint_set_active_group)(uint32_t gid, const char *store_path); - int (*ss_fingerprint_authenticate)(uint64_t operation_id, uint32_t gid); - int (*ss_fingerprint_request)(uint32_t cmd, char *inBuf, - uint32_t inBuf_length, char *outBuf, - uint32_t outBuf_length, uint32_t param); -}; - -} // namespace implementation -} // namespace V2_3 -} // namespace fingerprint -} // namespace biometrics -} // namespace hardware -} // namespace android - -#endif // ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_3_BIOMETRICSFINGERPRINT_H diff --git a/universal7885-common/bin/hardware/samsung/fingerprint/VendorConstants.h b/universal7885-common/bin/hardware/samsung/fingerprint/VendorConstants.h deleted file mode 100644 index 3af6c69..0000000 --- a/universal7885-common/bin/hardware/samsung/fingerprint/VendorConstants.h +++ /dev/null @@ -1,104 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// Copyright (C) 2020 The LineageOS Project - -#ifndef SAMSUNG_FINGERPRINT_CONSTANTS_H -#define SAMSUNG_FINGERPRINT_CONSTANTS_H - -// Fingerprint requests -#define FINGERPRINT_REQUEST_ENROLL_SESSION 1002 -#define FINGERPRINT_REQUEST_ENROLL_TYPE 18 -#define FINGERPRINT_REQUEST_ENUMERATE 11 -#define FINGERPRINT_REQUEST_GET_FP_IDS 1003 -#define FINGERPRINT_REQUEST_GET_MAX_TEMPLATE_NUMBER 1004 -#define FINGERPRINT_REQUEST_GET_SENSOR_INFO 5 -#define FINGERPRINT_REQUEST_GET_SENSOR_STATUS 6 -#define FINGERPRINT_REQUEST_GET_TOUCH_CNT 1007 -#define FINGERPRINT_REQUEST_GET_UNIQUE_ID 7 -#define FINGERPRINT_REQUEST_GET_USERIDS 12 -#define FINGERPRINT_REQUEST_GET_VERSION 4 -#define FINGERPRINT_REQUEST_HAS_FEATURE 1006 -#define FINGERPRINT_REQUEST_LOCKOUT 1001 -#define FINGERPRINT_REQUEST_NAVIGATION_LCD_ONOFF 17 -#define FINGERPRINT_REQUEST_NAVIGATION_MODE_END 16 -#define FINGERPRINT_REQUEST_NAVIGATION_MODE_START 15 -#define FINGERPRINT_REQUEST_PAUSE 0 -#define FINGERPRINT_REQUEST_PROCESS_FIDO 9 -#define FINGERPRINT_REQUEST_REMOVE_FINGER 1000 -#define FINGERPRINT_REQUEST_RESUME 1 -#define FINGERPRINT_REQUEST_SENSOR_TEST_NORMALSCAN 3 -#define FINGERPRINT_REQUEST_SESSION_OPEN 2 -#define FINGERPRINT_REQUEST_SET_ACTIVE_GROUP 8 -#define FINGERPRINT_REQUEST_UPDATE_SID 10 - -#define SEM_REQUEST_FORCE_CBGE 21 -#define SEM_REQUEST_GET_FINGER_ICON_REMAIN_TIME 1010 -#define SEM_REQUEST_GET_SECURITY_LEVEL 30 -#define SEM_REQUEST_GET_SENSOR_TEST_RESULT 19 -#define SEM_REQUEST_GET_TA_VERSION 10000 -#define SEM_REQUEST_GET_TSP_BLOCK_STATUS 0x3F9 -#define SEM_REQUEST_HIDE_INDISPLAY_AUTH_ANIMATION 0x3F4 -#define SEM_REQUEST_INSTALL_TA 10001 -#define SEM_REQUEST_IS_NEW_MATCHER 27 -#define SEM_REQUEST_IS_TEMPLATE_CHANGED 25 -#define SEM_REQUEST_MASK_CTL 0x3F5 -#define SEM_REQUEST_MOVE_INDISPLAY_ICON 0x3F3 -#define SEM_REQUEST_OPTICAL_CALIBRATION 0x3F8 -#define SEM_REQUEST_REMOVE_ALL_USER 0x3F6 -#define SEM_REQUEST_SET_ASP_LEVEL 20 -#define SEM_REQUEST_SET_BOUNCER_SCREEN_STATUS 0x3FA -#define SEM_REQUEST_SET_SCREEN_STATUS 0x3F0 -#define SEM_REQUEST_SHOW_INDISPLAY_AUTH_ANIMATION 1009 -#define SEM_REQUEST_TOUCH_EVENT 22 -#define SEM_REQUEST_TOUCH_SENSITIVE_CHANGE 0x3F7 -#define SEM_REQUEST_UPDATE_MATCHER 28 -#define SEM_REQUEST_VENDOR_EGIS_CALIBRATION 23 -#define SEM_REQUEST_VENDOR_QCOM_REMOVE_CBGE 24 -#define SEM_REQUEST_WIRELESS_CHARGER_STATUS 29 - -// Fingerprint aquired codes -#define SEM_FINGERPRINT_ACQUIRED_DUPLICATED_IMAGE 1002 -#define SEM_FINGERPRINT_ACQUIRED_LIGHT_TOUCH 1003 -#define SEM_FINGERPRINT_ACQUIRED_TSP_BLOCK 1004 -#define SEM_FINGERPRINT_ACQUIRED_TSP_UNBLOCK 1005 -#define SEM_FINGERPRINT_ACQUIRED_WET_FINGER 1001 - -// Fingerprint errors -#define SEM_FINGERPRINT_ERROR_CALIBRATION 1001 -#define SEM_FINGERPRINT_ERROR_DISABLED_BIOMETRICS 5002 -#define SEM_FINGERPRINT_ERROR_INVALID_HW 1005 -#define SEM_FINGERPRINT_ERROR_NEED_TO_RETRY 5000 -#define SEM_FINGERPRINT_ERROR_ONE_HAND_MODE 5001 -#define SEM_FINGERPRINT_ERROR_PATTERN_DETECTED 1007 -#define SEM_FINGERPRINT_ERROR_SERVICE_FAILURE 1003 -#define SEM_FINGERPRINT_ERROR_SMART_VIEW 5003 -#define SEM_FINGERPRINT_ERROR_SYSTEM_FAILURE 1002 -#define SEM_FINGERPRINT_ERROR_TA_UPDATE -100 -#define SEM_FINGERPRINT_ERROR_TEMPLATE_CORRUPTED 1004 -#define SEM_FINGERPRINT_ERROR_TEMPLATE_FORMAT_CHANGED 1006 -#define SEM_FINGERPRINT_ERROR_WIRELESS_CHARGING 5004 - -// Fingerprint events -#define SEM_FINGERPRINT_EVENT_BASE 10000 -#define SEM_FINGERPRINT_EVENT_CAPTURE_COMPLETED 10003 -#define SEM_FINGERPRINT_EVENT_CAPTURE_FAILED 10006 -#define SEM_FINGERPRINT_EVENT_CAPTURE_READY 10001 -#define SEM_FINGERPRINT_EVENT_CAPTURE_STARTED 10002 -#define SEM_FINGERPRINT_EVENT_CAPTURE_SUCCESS 10005 -#define SEM_FINGERPRINT_EVENT_FACTORY_SNSR_SCRIPT_END 10009 -#define SEM_FINGERPRINT_EVENT_FACTORY_SNSR_SCRIPT_START 10008 -#define SEM_FINGERPRINT_EVENT_FINGER_LEAVE 10004 -#define SEM_FINGERPRINT_EVENT_FINGER_LEAVE_TIMEOUT 10007 -#define SEM_FINGERPRINT_EVENT_GESTURE_DTAP 20003 -#define SEM_FINGERPRINT_EVENT_GESTURE_LPRESS 20004 -#define SEM_FINGERPRINT_EVENT_GESTURE_SWIPE_DOWN 20002 -#define SEM_FINGERPRINT_EVENT_GESTURE_SWIPE_UP 20001 -#define SEM_FINGERPRINT_EVENT_SPEN_CONTROL_OFF 30002 -#define SEM_FINGERPRINT_EVENT_SPEN_CONTROL_ON 30001 - -// Fingerprint sensor status codes -#define SEM_SENSOR_STATUS_CALIBRATION_ERROR 100045 -#define SEM_SENSOR_STATUS_ERROR 100042 -#define SEM_SENSOR_STATUS_OK 100040 -#define SEM_SENSOR_STATUS_WORKING 100041 - -#endif // SAMSUNG_FINGERPRINT_CONSTANTS_H diff --git a/universal7885-common/bin/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc b/universal7885-common/bin/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc deleted file mode 100644 index dafed7c..0000000 --- a/universal7885-common/bin/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc +++ /dev/null @@ -1,8 +0,0 @@ -service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.3-service.samsung - # "class hal" causes a race condition on some devices due to files created - # in /data. As a workaround, postpone startup until later in boot once - # /data is mounted. - class late_start - user system - group system input uhid - writepid /dev/cpuset/system-background/tasks diff --git a/universal7885-common/bin/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml b/universal7885-common/bin/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml deleted file mode 100644 index cff1092..0000000 --- a/universal7885-common/bin/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - android.hardware.biometrics.fingerprint - hwbinder - 2.3 - - IBiometricsFingerprint - default - - - diff --git a/universal7885-common/bin/hardware/samsung/fingerprint/service.cpp b/universal7885-common/bin/hardware/samsung/fingerprint/service.cpp deleted file mode 100644 index 415c9d7..0000000 --- a/universal7885-common/bin/hardware/samsung/fingerprint/service.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2019 The LineageOS 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. - */ - -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.3-service.samsung" - -#include -#include -#include - -#include "BiometricsFingerprint.h" - -using android::hardware::configureRpcThreadpool; -using android::hardware::joinRpcThreadpool; - -using android::hardware::biometrics::fingerprint::V2_3::IBiometricsFingerprint; -using android::hardware::biometrics::fingerprint::V2_3::implementation:: - BiometricsFingerprint; - -using android::OK; -using android::sp; - -int main() { - android::sp bio = - BiometricsFingerprint::getInstance(); - - configureRpcThreadpool(1, true); - - if (bio == nullptr || bio->registerAsService() != OK) { - LOG(ERROR) << "Could not register service for Fingerprint HAL"; - goto shutdown; - } - - LOG(INFO) << "Fingerprint HAL service is Ready."; - joinRpcThreadpool(); - -shutdown: - // In normal operation, we don't expect the thread pool to shutdown - LOG(ERROR) << "Fingerprint HAL failed to join thread pool."; - return 1; -} diff --git a/universal7885-common/bin/hardware/samsung/keymaster/Android.mk b/universal7885-common/bin/hardware/samsung/keymaster/Android.mk deleted file mode 100644 index 930c9d0..0000000 --- a/universal7885-common/bin/hardware/samsung/keymaster/Android.mk +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright (C) 2019 The LineageOS 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. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - service.cpp - -LOCAL_SHARED_LIBRARIES := \ - android.hardware.keymaster@4.0 \ - libbase \ - libcutils \ - libhardware \ - libhidlbase \ - libkeymaster4 \ - liblog \ - libskeymaster4device \ - libutils - -LOCAL_MODULE := android.hardware.keymaster@4.0-service.samsung -LOCAL_INIT_RC := android.hardware.keymaster@4.0-service.samsung.rc -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_OWNER := samsung -LOCAL_VENDOR_MODULE := true - -include $(BUILD_EXECUTABLE) diff --git a/universal7885-common/bin/hardware/samsung/keymaster/android.hardware.keymaster@4.0-service.samsung.rc b/universal7885-common/bin/hardware/samsung/keymaster/android.hardware.keymaster@4.0-service.samsung.rc deleted file mode 100644 index b84165f..0000000 --- a/universal7885-common/bin/hardware/samsung/keymaster/android.hardware.keymaster@4.0-service.samsung.rc +++ /dev/null @@ -1,8 +0,0 @@ -service vendor.keymaster-4-0 /vendor/bin/hw/android.hardware.keymaster@4.0-service.samsung - class early_hal - user system - group system drmrpc - -on post-fs-data - mkdir /mnt/vendor/efs/DAK 0775 system system - restorecon -R /mnt/vendor/efs/DAK diff --git a/universal7885-common/bin/hardware/samsung/keymaster/service.cpp b/universal7885-common/bin/hardware/samsung/keymaster/service.cpp deleted file mode 100644 index 4287c03..0000000 --- a/universal7885-common/bin/hardware/samsung/keymaster/service.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2019 The LineageOS 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. - */ - -#define LOG_TAG "android.hardware.keymaster@4.0-service.samsung" - -#include -#include -#include - -#include - -using android::hardware::configureRpcThreadpool; -using android::hardware::joinRpcThreadpool; - -using android::hardware::keymaster::V4_0::IKeymasterDevice; -using android::hardware::keymaster::V4_0::SecurityLevel; - -using android::OK; -using android::status_t; - -namespace skeymaster { -IKeymasterDevice *CreateSKeymasterDevice(SecurityLevel securityLevel); -} // namespace skeymaster - -int main() { - IKeymasterDevice *keymaster = - skeymaster::CreateSKeymasterDevice(SecurityLevel::TRUSTED_ENVIRONMENT); - - configureRpcThreadpool(1, true); - - status_t status = keymaster->registerAsService(); - - if (status != OK) { - LOG(ERROR) << "Could not register service for Keymaster HAL"; - goto shutdown; - } - - LOG(INFO) << "Keymaster HAL service is Ready."; - joinRpcThreadpool(); - -shutdown: - // In normal operation, we don't expect the thread pool to shutdown - LOG(ERROR) << "Keymaster HAL failed to join thread pool."; - return -1; -} diff --git a/universal7885-common/bin/hardware/samsung/light/Android.bp b/universal7885-common/bin/hardware/samsung/light/Android.bp deleted file mode 100644 index 1b2322c..0000000 --- a/universal7885-common/bin/hardware/samsung/light/Android.bp +++ /dev/null @@ -1,23 +0,0 @@ -// -// Copyright (C) 2021 The LineageOS Project -// -// SPDX-License-Identifier: Apache-2.0 -// - -cc_binary { - name: "android.hardware.light-service.samsung", - relative_install_path: "hw", - init_rc: ["android.hardware.light-service.samsung.rc"], - vintf_fragments: ["android.hardware.light-service.samsung.xml"], - local_include_dirs: ["include"], - srcs: [ - "Lights.cpp", - "service.cpp", - ], - shared_libs: [ - "libbase", - "libbinder_ndk", - "android.hardware.light-V1-ndk_platform", - ], - vendor: true, -} diff --git a/universal7885-common/bin/hardware/samsung/light/Lights.cpp b/universal7885-common/bin/hardware/samsung/light/Lights.cpp deleted file mode 100644 index 45d12ba..0000000 --- a/universal7885-common/bin/hardware/samsung/light/Lights.cpp +++ /dev/null @@ -1,196 +0,0 @@ -/* - * Copyright (C) 2021 The LineageOS Project - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#define LOG_TAG "android.hardware.lights-service.samsung" - -#include -#include - -#include "Lights.h" - -#define COLOR_MASK 0x00ffffff -#define MAX_INPUT_BRIGHTNESS 255 - -namespace aidl { -namespace android { -namespace hardware { -namespace light { - -/* - * Write value to path and close file. - */ -template static void set(const std::string &path, const T &value) { - std::ofstream file(path); - file << value << std::endl; -} - -template static T get(const std::string &path, const T &def) { - std::ifstream file(path); - T result; - - file >> result; - return file.fail() ? def : result; -} - -Lights::Lights() { - mLights.emplace(LightType::BACKLIGHT, std::bind(&Lights::handleBacklight, - this, std::placeholders::_1)); -#ifdef BUTTON_BRIGHTNESS_NODE - mLights.emplace(LightType::BUTTONS, std::bind(&Lights::handleButtons, this, - std::placeholders::_1)); -#endif /* BUTTON_BRIGHTNESS_NODE */ -#ifdef LED_BLINK_NODE - mLights.emplace(LightType::BATTERY, std::bind(&Lights::handleBattery, this, - std::placeholders::_1)); - mLights.emplace( - LightType::NOTIFICATIONS, - std::bind(&Lights::handleNotifications, this, std::placeholders::_1)); - mLights.emplace(LightType::ATTENTION, std::bind(&Lights::handleAttention, - this, std::placeholders::_1)); -#endif /* LED_BLINK_NODE */ -} - -ndk::ScopedAStatus Lights::setLightState(int32_t id, - const HwLightState &state) { - LightType type = static_cast(id); - auto it = mLights.find(type); - - if (it == mLights.end()) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); - } - - /* - * Lock global mutex until light state is updated. - */ - std::lock_guard lock(mLock); - - it->second(state); - - return ndk::ScopedAStatus::ok(); -} - -void Lights::handleBacklight(const HwLightState &state) { - uint32_t max_brightness = - get(PANEL_MAX_BRIGHTNESS_NODE, MAX_INPUT_BRIGHTNESS); - uint32_t brightness = rgbToBrightness(state); - - if (max_brightness != MAX_INPUT_BRIGHTNESS) { - brightness = brightness * max_brightness / MAX_INPUT_BRIGHTNESS; - } - - set(PANEL_BRIGHTNESS_NODE, brightness); -} - -#ifdef BUTTON_BRIGHTNESS_NODE -void Lights::handleButtons(const HwLightState &state) { -#ifdef VAR_BUTTON_BRIGHTNESS - uint32_t brightness = rgbToBrightness(state); -#else - uint32_t brightness = (state.color & COLOR_MASK) ? 1 : 0; -#endif - - set(BUTTON_BRIGHTNESS_NODE, brightness); -} -#endif - -#ifdef LED_BLINK_NODE -void Lights::handleBattery(const HwLightState &state) { - mBatteryState = state; - setNotificationLED(); -} - -void Lights::handleNotifications(const HwLightState &state) { - mNotificationState = state; - setNotificationLED(); -} - -void Lights::handleAttention(const HwLightState &state) { - mAttentionState = state; - setNotificationLED(); -} - -void Lights::setNotificationLED() { - int32_t adjusted_brightness = MAX_INPUT_BRIGHTNESS; - HwLightState state; -#ifdef LED_BLN_NODE - bool bln = false; -#endif /* LED_BLN_NODE */ - - if (mNotificationState.color & COLOR_MASK) { - adjusted_brightness = LED_BRIGHTNESS_NOTIFICATION; - state = mNotificationState; -#ifdef LED_BLN_NODE - bln = true; -#endif /* LED_BLN_NODE */ - } else if (mAttentionState.color & COLOR_MASK) { - adjusted_brightness = LED_BRIGHTNESS_ATTENTION; - state = mAttentionState; - if (state.flashMode == FlashMode::HARDWARE) { - if (state.flashOnMs > 0 && state.flashOffMs == 0) - state.flashMode = FlashMode::NONE; - state.color = 0x000000ff; - } - if (state.flashMode == FlashMode::NONE) { - state.color = 0; - } - } else if (mBatteryState.color & COLOR_MASK) { - adjusted_brightness = LED_BRIGHTNESS_BATTERY; - state = mBatteryState; - } else { - set(LED_BLINK_NODE, "0x00000000 0 0"); - return; - } - - if (state.flashMode == FlashMode::NONE) { - state.flashOnMs = 0; - state.flashOffMs = 0; - } - - state.color = calibrateColor(state.color & COLOR_MASK, adjusted_brightness); - set(LED_BLINK_NODE, - ::android::base::StringPrintf("0x%08x %d %d", state.color, - state.flashOnMs, state.flashOffMs)); - -#ifdef LED_BLN_NODE - if (bln) { - set(LED_BLN_NODE, (state.color & COLOR_MASK) ? 1 : 0); - } -#endif /* LED_BLN_NODE */ -} - -uint32_t Lights::calibrateColor(uint32_t color, int32_t brightness) { - uint32_t red = ((color >> 16) & 0xFF) * LED_ADJUSTMENT_R; - uint32_t green = ((color >> 8) & 0xFF) * LED_ADJUSTMENT_G; - uint32_t blue = (color & 0xFF) * LED_ADJUSTMENT_B; - - return (((red * brightness) / 255) << 16) + - (((green * brightness) / 255) << 8) + ((blue * brightness) / 255); -} -#endif /* LED_BLINK_NODE */ - -#define AutoHwLight(light) \ - { .id = (int32_t)light, .type = light, .ordinal = 0 } - -ndk::ScopedAStatus Lights::getLights(std::vector *_aidl_return) { - for (auto const &light : mLights) { - _aidl_return->push_back(AutoHwLight(light.first)); - } - - return ndk::ScopedAStatus::ok(); -} - -uint32_t Lights::rgbToBrightness(const HwLightState &state) { - uint32_t color = state.color & COLOR_MASK; - - return ((77 * ((color >> 16) & 0xff)) + (150 * ((color >> 8) & 0xff)) + - (29 * (color & 0xff))) >> - 8; -} - -} // namespace light -} // namespace hardware -} // namespace android -} // namespace aidl diff --git a/universal7885-common/bin/hardware/samsung/light/Lights.h b/universal7885-common/bin/hardware/samsung/light/Lights.h deleted file mode 100644 index aa789b4..0000000 --- a/universal7885-common/bin/hardware/samsung/light/Lights.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2021 The LineageOS Project - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#pragma once - -#include "samsung_lights.h" -#include -#include - -using ::aidl::android::hardware::light::HwLight; -using ::aidl::android::hardware::light::HwLightState; - -namespace aidl { -namespace android { -namespace hardware { -namespace light { - -class Lights : public BnLights { -public: - Lights(); - - ndk::ScopedAStatus setLightState(int32_t id, - const HwLightState &state) override; - ndk::ScopedAStatus getLights(std::vector *_aidl_return) override; - -private: - void handleBacklight(const HwLightState &state); -#ifdef BUTTON_BRIGHTNESS_NODE - void handleButtons(const HwLightState &state); -#endif /* BUTTON_BRIGHTNESS_NODE */ -#ifdef LED_BLINK_NODE - void handleBattery(const HwLightState &state); - void handleNotifications(const HwLightState &state); - void handleAttention(const HwLightState &state); - void setNotificationLED(); - uint32_t calibrateColor(uint32_t color, int32_t brightness); - - HwLightState mAttentionState; - HwLightState mBatteryState; - HwLightState mNotificationState; -#endif /* LED_BLINK_NODE */ - - uint32_t rgbToBrightness(const HwLightState &state); - - std::mutex mLock; - std::unordered_map> - mLights; -}; - -} // namespace light -} // namespace hardware -} // namespace android -} // namespace aidl diff --git a/universal7885-common/bin/hardware/samsung/light/android.hardware.light-service.samsung.rc b/universal7885-common/bin/hardware/samsung/light/android.hardware.light-service.samsung.rc deleted file mode 100644 index 249e036..0000000 --- a/universal7885-common/bin/hardware/samsung/light/android.hardware.light-service.samsung.rc +++ /dev/null @@ -1,5 +0,0 @@ -service vendor.light-default /vendor/bin/hw/android.hardware.light-service.samsung - class hal - user system - group system - shutdown critical diff --git a/universal7885-common/bin/hardware/samsung/light/android.hardware.light-service.samsung.xml b/universal7885-common/bin/hardware/samsung/light/android.hardware.light-service.samsung.xml deleted file mode 100644 index 7033534..0000000 --- a/universal7885-common/bin/hardware/samsung/light/android.hardware.light-service.samsung.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - android.hardware.light - ILights/default - - diff --git a/universal7885-common/bin/hardware/samsung/light/include/samsung_lights.h b/universal7885-common/bin/hardware/samsung/light/include/samsung_lights.h deleted file mode 100644 index 2235448..0000000 --- a/universal7885-common/bin/hardware/samsung/light/include/samsung_lights.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2016 The CyanogenMod Project - * Copyright (C) 2017 The LineageOS 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. - */ - -#ifndef SAMSUNG_LIGHTS_H -#define SAMSUNG_LIGHTS_H - -/* - * Board specific nodes - * - * If your kernel exposes these controls in another place, you can either - * symlink to the locations given here, or override this header in your - * device tree. - */ -#define PANEL_BRIGHTNESS_NODE "/sys/class/backlight/panel/brightness" -#define PANEL_MAX_BRIGHTNESS_NODE "/sys/class/backlight/panel/max_brightness" -#define BUTTON_BRIGHTNESS_NODE "/sys/class/sec/sec_touchkey/brightness" -#define LED_BLINK_NODE "/sys/class/sec/led/led_blink" -#define LED_BLN_NODE "/sys/class/misc/backlightnotification/notification_led" - -// Uncomment to enable variable button brightness -// #define VAR_BUTTON_BRIGHTNESS 1 - -/* - * Brightness adjustment factors - * - * If one of your device's LEDs is more powerful than the others, use these - * values to equalise them. This value is in the range 0.0-1.0. - */ -#define LED_ADJUSTMENT_R 1.0 -#define LED_ADJUSTMENT_G 1.0 -#define LED_ADJUSTMENT_B 1.0 - -/* - * Light brightness factors - * - * It might make sense for all colours to be scaled down (for example, if your - * LED is too bright). Use these values to adjust the brightness of each - * light. This value is within the range 0-255. - */ -#define LED_BRIGHTNESS_BATTERY 255 -#define LED_BRIGHTNESS_NOTIFICATION 255 -#define LED_BRIGHTNESS_ATTENTION 255 - -#endif // SAMSUNG_LIGHTS_H diff --git a/universal7885-common/bin/hardware/samsung/light/service.cpp b/universal7885-common/bin/hardware/samsung/light/service.cpp deleted file mode 100644 index 76f4b5c..0000000 --- a/universal7885-common/bin/hardware/samsung/light/service.cpp +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2021 The LineageOS Project - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#define LOG_TAG "android.hardware.light-service.samsung" - -#include "Lights.h" - -#include -#include -#include - -using ::aidl::android::hardware::light::Lights; - -int main() { - ABinderProcess_setThreadPoolMaxThreadCount(0); - std::shared_ptr lights = ndk::SharedRefBase::make(); - - 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 reach -} diff --git a/universal7885-common/bin/hardware/samsung/power-libperfmgr/Android.bp b/universal7885-common/bin/hardware/samsung/power-libperfmgr/Android.bp deleted file mode 100644 index b691aa5..0000000 --- a/universal7885-common/bin/hardware/samsung/power-libperfmgr/Android.bp +++ /dev/null @@ -1,38 +0,0 @@ -// -// Copyright (C) 2018 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. - -cc_binary { - name: "android.hardware.power-service.samsung-libperfmgr", - relative_install_path: "hw", - init_rc: ["android.hardware.power-service.samsung-libperfmgr.rc"], - vintf_fragments: ["android.hardware.power-service.samsung.xml"], - vendor: true, - shared_libs: [ - "android.hardware.power-V1-ndk_platform", - "libbase", - "libcutils", - "liblog", - "libutils", - "libbinder_ndk", - "libperfmgr", - "pixel-power-ext-V1-ndk_platform", - ], - srcs: [ - "service.cpp", - "Power.cpp", - "PowerExt.cpp", - "InteractionHandler.cpp" - ], -} diff --git a/universal7885-common/bin/hardware/samsung/power-libperfmgr/InteractionHandler.cpp b/universal7885-common/bin/hardware/samsung/power-libperfmgr/InteractionHandler.cpp deleted file mode 100644 index 4f03782..0000000 --- a/universal7885-common/bin/hardware/samsung/power-libperfmgr/InteractionHandler.cpp +++ /dev/null @@ -1,265 +0,0 @@ -/* - * Copyright (C) 2018 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. - */ - -#define LOG_TAG "android.hardware.power@-service.samsung-libperfmgr" -#define ATRACE_TAG (ATRACE_TAG_POWER | ATRACE_TAG_HAL) - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "InteractionHandler.h" - -#define MAX_LENGTH 64 - -#define MSINSEC 1000L -#define USINMS 1000000L - -static const std::vector fb_idle_patch = { - "/sys/class/drm/card0/device/idle_state", - "/sys/class/graphics/fb0/idle_state"}; - -InteractionHandler::InteractionHandler( - std::shared_ptr const &hint_manager) - : mState(INTERACTION_STATE_UNINITIALIZED), mWaitMs(100), - mMinDurationMs(1400), mMaxDurationMs(5650), mDurationMs(0), - mHintManager(hint_manager) {} - -InteractionHandler::~InteractionHandler() { Exit(); } - -static int fb_idle_open(void) { - int fd; - for (auto &path : fb_idle_patch) { - fd = open(path.c_str(), O_RDONLY); - if (fd >= 0) - return fd; - } - ALOGE("Unable to open fb idle state path (%d)", errno); - return -1; -} - -bool InteractionHandler::Init() { - std::lock_guard lk(mLock); - - if (mState != INTERACTION_STATE_UNINITIALIZED) - return true; - - mIdleFd = fb_idle_open(); - - mEventFd = eventfd(0, EFD_NONBLOCK); - if (mEventFd < 0) { - ALOGE("Unable to create event fd (%d)", errno); - if (mIdleFd >= 0) { - close(mIdleFd); - } - return false; - } - - mState = INTERACTION_STATE_IDLE; - mThread = std::unique_ptr( - new std::thread(&InteractionHandler::Routine, this)); - - return true; -} - -void InteractionHandler::Exit() { - std::unique_lock lk(mLock); - if (mState == INTERACTION_STATE_UNINITIALIZED) - return; - - AbortWaitLocked(); - mState = INTERACTION_STATE_UNINITIALIZED; - lk.unlock(); - - mCond.notify_all(); - mThread->join(); - - close(mEventFd); - if (mIdleFd >= 0) { - close(mIdleFd); - } -} - -void InteractionHandler::PerfLock() { - ALOGV("%s: acquiring perf lock", __func__); - if (!mHintManager->DoHint("INTERACTION")) { - ALOGE("%s: do hint INTERACTION failed", __func__); - } - ATRACE_INT("interaction_lock", 1); -} - -void InteractionHandler::PerfRel() { - ALOGV("%s: releasing perf lock", __func__); - if (!mHintManager->EndHint("INTERACTION")) { - ALOGE("%s: end hint INTERACTION failed", __func__); - } - ATRACE_INT("interaction_lock", 0); -} - -size_t InteractionHandler::CalcTimespecDiffMs(struct timespec start, - struct timespec end) { - size_t diff_in_us = 0; - diff_in_us += (end.tv_sec - start.tv_sec) * MSINSEC; - diff_in_us += (end.tv_nsec - start.tv_nsec) / USINMS; - return diff_in_us; -} - -void InteractionHandler::Acquire(int32_t duration) { - ATRACE_CALL(); - - std::lock_guard lk(mLock); - if (mState == INTERACTION_STATE_UNINITIALIZED) { - ALOGW("%s: called while uninitialized", __func__); - return; - } - - int inputDuration = duration + 650; - int finalDuration; - if (inputDuration > mMaxDurationMs) - finalDuration = mMaxDurationMs; - else if (inputDuration > mMinDurationMs) - finalDuration = inputDuration; - else - finalDuration = mMinDurationMs; - - struct timespec cur_timespec; - clock_gettime(CLOCK_MONOTONIC, &cur_timespec); - if (mState != INTERACTION_STATE_IDLE && finalDuration <= mDurationMs) { - size_t elapsed_time = CalcTimespecDiffMs(mLastTimespec, cur_timespec); - // don't hint if previous hint's duration covers this hint's duration - if (elapsed_time <= (mDurationMs - finalDuration)) { - ALOGV("%s: Previous duration (%d) cover this (%d) elapsed: %lld", - __func__, static_cast(mDurationMs), - static_cast(finalDuration), - static_cast(elapsed_time)); - return; - } - } - mLastTimespec = cur_timespec; - mDurationMs = finalDuration; - - ALOGV("%s: input: %d final duration: %d", __func__, duration, finalDuration); - - if (mState == INTERACTION_STATE_WAITING) - AbortWaitLocked(); - else if (mState == INTERACTION_STATE_IDLE) - PerfLock(); - - mState = INTERACTION_STATE_INTERACTION; - mCond.notify_one(); -} - -void InteractionHandler::Release() { - std::lock_guard lk(mLock); - if (mState == INTERACTION_STATE_WAITING) { - ATRACE_CALL(); - PerfRel(); - mState = INTERACTION_STATE_IDLE; - } else { - // clear any wait aborts pending in event fd - uint64_t val; - ssize_t ret = read(mEventFd, &val, sizeof(val)); - - ALOGW_IF(ret < 0, "%s: failed to clear eventfd (%zd, %d)", __func__, ret, - errno); - } -} - -// should be called while locked -void InteractionHandler::AbortWaitLocked() { - uint64_t val = 1; - ssize_t ret = write(mEventFd, &val, sizeof(val)); - if (ret != sizeof(val)) - ALOGW("Unable to write to event fd (%zd)", ret); -} - -void InteractionHandler::WaitForIdle(int32_t wait_ms, int32_t timeout_ms) { - char data[MAX_LENGTH]; - ssize_t ret; - struct pollfd pfd[2]; - - ATRACE_CALL(); - - ALOGV("%s: wait:%d timeout:%d", __func__, wait_ms, timeout_ms); - - pfd[0].fd = mEventFd; - pfd[0].events = POLLIN; - pfd[1].fd = mIdleFd; - pfd[1].events = POLLPRI | POLLERR; - - ret = poll(pfd, 1, wait_ms); - if (ret > 0) { - ALOGV("%s: wait aborted", __func__); - return; - } else if (ret < 0) { - ALOGE("%s: error in poll while waiting", __func__); - return; - } - - if (mIdleFd < 0) { - ret = poll(pfd, 1, timeout_ms); - if (ret > 0) { - ALOGV("%s: wait for duration aborted", __func__); - return; - } else if (ret < 0) { - ALOGE("%s: Error on waiting for duration (%zd)", __func__, ret); - return; - } - return; - } - - ret = pread(mIdleFd, data, sizeof(data), 0); - if (!ret) { - ALOGE("%s: Unexpected EOF!", __func__); - return; - } - - if (!strncmp(data, "idle", 4)) { - ALOGV("%s: already idle", __func__); - return; - } - - ret = poll(pfd, 2, timeout_ms); - if (ret < 0) - ALOGE("%s: Error on waiting for idle (%zd)", __func__, ret); - else if (ret == 0) - ALOGV("%s: timed out waiting for idle", __func__); - else if (pfd[0].revents) - ALOGV("%s: wait for idle aborted", __func__); - else if (pfd[1].revents) - ALOGV("%s: idle detected", __func__); -} - -void InteractionHandler::Routine() { - std::unique_lock lk(mLock, std::defer_lock); - - while (true) { - lk.lock(); - mCond.wait(lk, [&] { return mState != INTERACTION_STATE_IDLE; }); - if (mState == INTERACTION_STATE_UNINITIALIZED) - return; - mState = INTERACTION_STATE_WAITING; - lk.unlock(); - - WaitForIdle(mWaitMs, mDurationMs); - Release(); - } -} diff --git a/universal7885-common/bin/hardware/samsung/power-libperfmgr/InteractionHandler.h b/universal7885-common/bin/hardware/samsung/power-libperfmgr/InteractionHandler.h deleted file mode 100644 index 4547847..0000000 --- a/universal7885-common/bin/hardware/samsung/power-libperfmgr/InteractionHandler.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2018 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. - */ - -#ifndef POWER_LIBPERFMGR_INTERACTIONHANDLER_H_ -#define POWER_LIBPERFMGR_INTERACTIONHANDLER_H_ - -#include -#include -#include -#include -#include - -#include - -using ::android::perfmgr::HintManager; - -enum interaction_state { - INTERACTION_STATE_UNINITIALIZED, - INTERACTION_STATE_IDLE, - INTERACTION_STATE_INTERACTION, - INTERACTION_STATE_WAITING, -}; - -class InteractionHandler { -public: - InteractionHandler(std::shared_ptr const &hint_manager); - ~InteractionHandler(); - bool Init(); - void Exit(); - void Acquire(int32_t duration); - -private: - void Release(); - void WaitForIdle(int32_t wait_ms, int32_t timeout_ms); - void AbortWaitLocked(); - void Routine(); - - void PerfLock(); - void PerfRel(); - - size_t CalcTimespecDiffMs(struct timespec start, struct timespec end); - - enum interaction_state mState; - - int mIdleFd; - int mEventFd; - - int32_t mWaitMs; - int32_t mMinDurationMs; - int32_t mMaxDurationMs; - int32_t mDurationMs; - - struct timespec mLastTimespec; - - std::unique_ptr mThread; - std::mutex mLock; - std::condition_variable mCond; - std::shared_ptr mHintManager; -}; - -#endif // POWER_LIBPERFMGR_INTERACTIONHANDLER_H_ diff --git a/universal7885-common/bin/hardware/samsung/power-libperfmgr/Power.cpp b/universal7885-common/bin/hardware/samsung/power-libperfmgr/Power.cpp deleted file mode 100644 index 9a52b1a..0000000 --- a/universal7885-common/bin/hardware/samsung/power-libperfmgr/Power.cpp +++ /dev/null @@ -1,262 +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. - */ - -#define ATRACE_TAG (ATRACE_TAG_POWER | ATRACE_TAG_HAL) -#define LOG_TAG "android.hardware.power-service.samsung-libperfmgr" - -#include "Power.h" - -#include - -#include -#include -#include -#include -#include - -#include -#include - -namespace aidl { -namespace google { -namespace hardware { -namespace power { -namespace impl { -namespace pixel { - -constexpr char kPowerHalStateProp[] = "vendor.powerhal.state"; -constexpr char kPowerHalAudioProp[] = "vendor.powerhal.audio"; -constexpr char kPowerHalRenderingProp[] = "vendor.powerhal.rendering"; - -Power::Power(std::shared_ptr hm) - : mHintManager(hm), mInteractionHandler(nullptr), mVRModeOn(false), - mSustainedPerfModeOn(false) { - mInteractionHandler = std::make_unique(mHintManager); - mInteractionHandler->Init(); - - std::string state = ::android::base::GetProperty(kPowerHalStateProp, ""); - if (state == "SUSTAINED_PERFORMANCE") { - ALOGI("Initialize with SUSTAINED_PERFORMANCE on"); - mHintManager->DoHint("SUSTAINED_PERFORMANCE"); - mSustainedPerfModeOn = true; - } else if (state == "VR") { - ALOGI("Initialize with VR on"); - mHintManager->DoHint(state); - mVRModeOn = true; - } else if (state == "VR_SUSTAINED_PERFORMANCE") { - ALOGI("Initialize with SUSTAINED_PERFORMANCE and VR on"); - mHintManager->DoHint("VR_SUSTAINED_PERFORMANCE"); - mSustainedPerfModeOn = true; - mVRModeOn = true; - } else { - ALOGI("Initialize PowerHAL"); - } - - state = ::android::base::GetProperty(kPowerHalAudioProp, ""); - if (state == "AUDIO_STREAMING_LOW_LATENCY") { - ALOGI("Initialize with AUDIO_LOW_LATENCY on"); - mHintManager->DoHint(state); - } - - state = ::android::base::GetProperty(kPowerHalRenderingProp, ""); - if (state == "EXPENSIVE_RENDERING") { - ALOGI("Initialize with EXPENSIVE_RENDERING on"); - mHintManager->DoHint("EXPENSIVE_RENDERING"); - } - - // Now start to take powerhint - ALOGI("PowerHAL ready to process hints"); -} - -ndk::ScopedAStatus Power::setMode(Mode type, bool enabled) { - LOG(DEBUG) << "Power setMode: " << toString(type) << " to: " << enabled; - ATRACE_INT(toString(type).c_str(), enabled); - switch (type) { - case Mode::LOW_POWER: - if (enabled) { - mHintManager->DoHint(toString(type)); - } else { - mHintManager->EndHint(toString(type)); - } - break; - case Mode::SUSTAINED_PERFORMANCE: - if (enabled && !mSustainedPerfModeOn) { - if (!mVRModeOn) { // Sustained mode only. - mHintManager->DoHint("SUSTAINED_PERFORMANCE"); - } else { // Sustained + VR mode. - mHintManager->EndHint("VR"); - mHintManager->DoHint("VR_SUSTAINED_PERFORMANCE"); - } - mSustainedPerfModeOn = true; - } else if (!enabled && mSustainedPerfModeOn) { - mHintManager->EndHint("VR_SUSTAINED_PERFORMANCE"); - mHintManager->EndHint("SUSTAINED_PERFORMANCE"); - if (mVRModeOn) { // Switch back to VR Mode. - mHintManager->DoHint("VR"); - } - mSustainedPerfModeOn = false; - } - break; - case Mode::VR: - if (enabled && !mVRModeOn) { - if (!mSustainedPerfModeOn) { // VR mode only. - mHintManager->DoHint("VR"); - } else { // Sustained + VR mode. - mHintManager->EndHint("SUSTAINED_PERFORMANCE"); - mHintManager->DoHint("VR_SUSTAINED_PERFORMANCE"); - } - mVRModeOn = true; - } else if (!enabled && mVRModeOn) { - mHintManager->EndHint("VR_SUSTAINED_PERFORMANCE"); - mHintManager->EndHint("VR"); - if (mSustainedPerfModeOn) { // Switch back to sustained Mode. - mHintManager->DoHint("SUSTAINED_PERFORMANCE"); - } - mVRModeOn = false; - } - break; - case Mode::LAUNCH: - if (mVRModeOn || mSustainedPerfModeOn) { - break; - } - [[fallthrough]]; - case Mode::DOUBLE_TAP_TO_WAKE: - [[fallthrough]]; - case Mode::FIXED_PERFORMANCE: - [[fallthrough]]; - case Mode::EXPENSIVE_RENDERING: - [[fallthrough]]; - case Mode::INTERACTIVE: - [[fallthrough]]; - case Mode::DEVICE_IDLE: - [[fallthrough]]; - case Mode::DISPLAY_INACTIVE: - [[fallthrough]]; - case Mode::AUDIO_STREAMING_LOW_LATENCY: - [[fallthrough]]; - case Mode::CAMERA_STREAMING_SECURE: - [[fallthrough]]; - case Mode::CAMERA_STREAMING_LOW: - [[fallthrough]]; - case Mode::CAMERA_STREAMING_MID: - [[fallthrough]]; - case Mode::CAMERA_STREAMING_HIGH: - [[fallthrough]]; - default: - if (enabled) { - mHintManager->DoHint(toString(type)); - } else { - mHintManager->EndHint(toString(type)); - } - break; - } - - return ndk::ScopedAStatus::ok(); -} - -ndk::ScopedAStatus Power::isModeSupported(Mode type, bool *_aidl_return) { - bool supported = mHintManager->IsHintSupported(toString(type)); - switch (type) { - case Mode::LOW_POWER: // LOW_POWER handled insides PowerHAL specifically - supported = true; - break; - case Mode::DOUBLE_TAP_TO_WAKE: - supported = true; - break; - case Mode::INTERACTIVE: - supported = true; - break; - default: - break; - } - - LOG(INFO) << "Power mode " << toString(type) - << " isModeSupported: " << supported; - *_aidl_return = supported; - return ndk::ScopedAStatus::ok(); -} - -ndk::ScopedAStatus Power::setBoost(Boost type, int32_t durationMs) { - LOG(DEBUG) << "Power setBoost: " << toString(type) - << " duration: " << durationMs; - ATRACE_INT(toString(type).c_str(), durationMs); - switch (type) { - case Boost::INTERACTION: - if (mVRModeOn || mSustainedPerfModeOn) { - break; - } - mInteractionHandler->Acquire(durationMs); - break; - case Boost::DISPLAY_UPDATE_IMMINENT: - [[fallthrough]]; - case Boost::ML_ACC: - [[fallthrough]]; - case Boost::AUDIO_LAUNCH: - [[fallthrough]]; - case Boost::CAMERA_LAUNCH: - [[fallthrough]]; - case Boost::CAMERA_SHOT: - [[fallthrough]]; - default: - if (mVRModeOn || mSustainedPerfModeOn) { - break; - } - if (durationMs > 0) { - mHintManager->DoHint(toString(type), - std::chrono::milliseconds(durationMs)); - } else if (durationMs == 0) { - mHintManager->DoHint(toString(type)); - } else { - mHintManager->EndHint(toString(type)); - } - break; - } - - return ndk::ScopedAStatus::ok(); -} - -ndk::ScopedAStatus Power::isBoostSupported(Boost type, bool *_aidl_return) { - bool supported = mHintManager->IsHintSupported(toString(type)); - LOG(INFO) << "Power boost " << toString(type) - << " isBoostSupported: " << supported; - *_aidl_return = supported; - return ndk::ScopedAStatus::ok(); -} - -constexpr const char *boolToString(bool b) { return b ? "true" : "false"; } - -binder_status_t Power::dump(int fd, const char **, uint32_t) { - std::string buf(::android::base::StringPrintf( - "HintManager Running: %s\n" - "VRMode: %s\n" - "SustainedPerformanceMode: %s\n", - boolToString(mHintManager->IsRunning()), boolToString(mVRModeOn), - boolToString(mSustainedPerfModeOn))); - // Dump nodes through libperfmgr - mHintManager->DumpToFd(fd); - if (!::android::base::WriteStringToFd(buf, fd)) { - PLOG(ERROR) << "Failed to dump state to fd"; - } - fsync(fd); - return STATUS_OK; -} - -} // namespace pixel -} // namespace impl -} // namespace power -} // namespace hardware -} // namespace google -} // namespace aidl diff --git a/universal7885-common/bin/hardware/samsung/power-libperfmgr/Power.h b/universal7885-common/bin/hardware/samsung/power-libperfmgr/Power.h deleted file mode 100644 index 83279d4..0000000 --- a/universal7885-common/bin/hardware/samsung/power-libperfmgr/Power.h +++ /dev/null @@ -1,61 +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 -#include -#include - -#include -#include - -#include "InteractionHandler.h" - -namespace aidl { -namespace google { -namespace hardware { -namespace power { -namespace impl { -namespace pixel { - -using ::InteractionHandler; -using ::aidl::android::hardware::power::Boost; -using ::aidl::android::hardware::power::Mode; -using ::android::perfmgr::HintManager; - -class Power : public ::aidl::android::hardware::power::BnPower { -public: - Power(std::shared_ptr hm); - ndk::ScopedAStatus setMode(Mode type, bool enabled) override; - ndk::ScopedAStatus isModeSupported(Mode type, bool *_aidl_return) override; - ndk::ScopedAStatus setBoost(Boost type, int32_t durationMs) override; - ndk::ScopedAStatus isBoostSupported(Boost type, bool *_aidl_return) override; - binder_status_t dump(int fd, const char **args, uint32_t numArgs) override; - -private: - std::shared_ptr mHintManager; - std::unique_ptr mInteractionHandler; - std::atomic mVRModeOn; - std::atomic mSustainedPerfModeOn; -}; - -} // namespace pixel -} // namespace impl -} // namespace power -} // namespace hardware -} // namespace google -} // namespace aidl diff --git a/universal7885-common/bin/hardware/samsung/power-libperfmgr/PowerExt.cpp b/universal7885-common/bin/hardware/samsung/power-libperfmgr/PowerExt.cpp deleted file mode 100644 index 59d6fb4..0000000 --- a/universal7885-common/bin/hardware/samsung/power-libperfmgr/PowerExt.cpp +++ /dev/null @@ -1,90 +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. - */ - -#define ATRACE_TAG (ATRACE_TAG_POWER | ATRACE_TAG_HAL) -#define LOG_TAG "android.hardware.power-service.samsung.ext-libperfmgr" - -#include "PowerExt.h" - -#include - -#include -#include -#include -#include -#include - -#include -#include - -namespace aidl { -namespace google { -namespace hardware { -namespace power { -namespace impl { -namespace pixel { - -ndk::ScopedAStatus PowerExt::setMode(const std::string &mode, bool enabled) { - LOG(DEBUG) << "PowerExt setMode: " << mode << " to: " << enabled; - ATRACE_INT(mode.c_str(), enabled); - - if (enabled) { - mHintManager->DoHint(mode); - } else { - mHintManager->EndHint(mode); - } - - return ndk::ScopedAStatus::ok(); -} - -ndk::ScopedAStatus PowerExt::isModeSupported(const std::string &mode, - bool *_aidl_return) { - bool supported = mHintManager->IsHintSupported(mode); - LOG(INFO) << "PowerExt mode " << mode << " isModeSupported: " << supported; - *_aidl_return = supported; - return ndk::ScopedAStatus::ok(); -} - -ndk::ScopedAStatus PowerExt::setBoost(const std::string &boost, - int32_t durationMs) { - LOG(DEBUG) << "PowerExt setBoost: " << boost << " duration: " << durationMs; - ATRACE_INT(boost.c_str(), durationMs); - - if (durationMs > 0) { - mHintManager->DoHint(boost, std::chrono::milliseconds(durationMs)); - } else if (durationMs == 0) { - mHintManager->DoHint(boost); - } else { - mHintManager->EndHint(boost); - } - - return ndk::ScopedAStatus::ok(); -} - -ndk::ScopedAStatus PowerExt::isBoostSupported(const std::string &boost, - bool *_aidl_return) { - bool supported = mHintManager->IsHintSupported(boost); - LOG(INFO) << "PowerExt boost " << boost << " isBoostSupported: " << supported; - *_aidl_return = supported; - return ndk::ScopedAStatus::ok(); -} - -} // namespace pixel -} // namespace impl -} // namespace power -} // namespace hardware -} // namespace google -} // namespace aidl diff --git a/universal7885-common/bin/hardware/samsung/power-libperfmgr/PowerExt.h b/universal7885-common/bin/hardware/samsung/power-libperfmgr/PowerExt.h deleted file mode 100644 index 02696f8..0000000 --- a/universal7885-common/bin/hardware/samsung/power-libperfmgr/PowerExt.h +++ /dev/null @@ -1,56 +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 -#include -#include - -#include -#include - -namespace aidl { -namespace google { -namespace hardware { -namespace power { -namespace impl { -namespace pixel { - -using ::android::perfmgr::HintManager; - -class PowerExt - : public ::aidl::google::hardware::power::extension::pixel::BnPowerExt { -public: - PowerExt(std::shared_ptr hm) : mHintManager(hm) {} - ndk::ScopedAStatus setMode(const std::string &mode, bool enabled) override; - ndk::ScopedAStatus isModeSupported(const std::string &mode, - bool *_aidl_return) override; - ndk::ScopedAStatus setBoost(const std::string &boost, - int32_t durationMs) override; - ndk::ScopedAStatus isBoostSupported(const std::string &boost, - bool *_aidl_return) override; - -private: - std::shared_ptr mHintManager; -}; - -} // namespace pixel -} // namespace impl -} // namespace power -} // namespace hardware -} // namespace google -} // namespace aidl diff --git a/universal7885-common/bin/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung-libperfmgr.rc b/universal7885-common/bin/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung-libperfmgr.rc deleted file mode 100644 index 93497c9..0000000 --- a/universal7885-common/bin/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung-libperfmgr.rc +++ /dev/null @@ -1,28 +0,0 @@ -service vendor.power-hal-aidl /vendor/bin/hw/android.hardware.power-service.samsung-libperfmgr - class hal - user root - group system radio - priority -20 - -on late-fs - start vendor.power-hal-aidl - -# restart powerHAL when framework died -on property:init.svc.zygote=restarting && property:vendor.powerhal.state=* - setprop vendor.powerhal.state "" - setprop vendor.powerhal.audio "" - setprop vendor.powerhal.rendering "" - restart vendor.power-hal-aidl - -# Clean up after b/163539793 resolved -on property:vendor.powerhal.dalvik.vm.dex2oat-threads=* - setprop dalvik.vm.dex2oat-threads ${vendor.powerhal.dalvik.vm.dex2oat-threads} - setprop dalvik.vm.restore-dex2oat-threads ${vendor.powerhal.dalvik.vm.dex2oat-threads} - -on property:vendor.powerhal.dalvik.vm.dex2oat-cpu-set=* - setprop dalvik.vm.dex2oat-cpu-set ${vendor.powerhal.dalvik.vm.dex2oat-cpu-set} - setprop dalvik.vm.restore-dex2oat-cpu-set ${vendor.powerhal.dalvik.vm.dex2oat-cpu-set} - -# initialize powerHAL when boot is completed -on property:sys.boot_completed=1 - setprop vendor.powerhal.init 1 diff --git a/universal7885-common/bin/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung.xml b/universal7885-common/bin/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung.xml deleted file mode 100644 index 9f94671..0000000 --- a/universal7885-common/bin/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - android.hardware.power - IPower/default - - diff --git a/universal7885-common/bin/hardware/samsung/power-libperfmgr/service.cpp b/universal7885-common/bin/hardware/samsung/power-libperfmgr/service.cpp deleted file mode 100644 index dbb39b9..0000000 --- a/universal7885-common/bin/hardware/samsung/power-libperfmgr/service.cpp +++ /dev/null @@ -1,77 +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. - */ - -#define LOG_TAG "android.hardware.power-service.samsung-libperfmgr" - -#include - -#include -#include -#include -#include - -#include "Power.h" -#include "PowerExt.h" - -using aidl::google::hardware::power::impl::pixel::Power; -using aidl::google::hardware::power::impl::pixel::PowerExt; -using ::android::perfmgr::HintManager; - -constexpr char kPowerHalConfigPath[] = "/vendor/etc/powerhint.json"; -constexpr char kPowerHalInitProp[] = "vendor.powerhal.init"; - -int main() { - LOG(INFO) << "Pixel Power HAL AIDL Service with Extension is starting."; - - // Parse config but do not start the looper - std::shared_ptr hm = - HintManager::GetFromJSON(kPowerHalConfigPath, false); - if (!hm) { - LOG(FATAL) << "Invalid config: " << kPowerHalConfigPath; - } - - // single thread - ABinderProcess_setThreadPoolMaxThreadCount(0); - - // core service - std::shared_ptr pw = ndk::SharedRefBase::make(hm); - ndk::SpAIBinder pwBinder = pw->asBinder(); - - // extension service - std::shared_ptr pwExt = ndk::SharedRefBase::make(hm); - - // attach the extension to the same binder we will be registering - CHECK(STATUS_OK == - AIBinder_setExtension(pwBinder.get(), pwExt->asBinder().get())); - - const std::string instance = std::string() + Power::descriptor + "/default"; - binder_status_t status = - AServiceManager_addService(pw->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); - LOG(INFO) << "Pixel Power HAL AIDL Service with Extension is started."; - - std::thread initThread([&]() { - ::android::base::WaitForProperty(kPowerHalInitProp, "1"); - hm->Start(); - }); - initThread.detach(); - - ABinderProcess_joinThreadPool(); - - // should not reach - LOG(ERROR) << "Pixel Power HAL AIDL Service with Extension just died."; - return EXIT_FAILURE; -} diff --git a/universal7885-common/bin/hardware/samsung/secril_config_svc/Android.bp b/universal7885-common/bin/hardware/samsung/secril_config_svc/Android.bp deleted file mode 100644 index 266ad5b..0000000 --- a/universal7885-common/bin/hardware/samsung/secril_config_svc/Android.bp +++ /dev/null @@ -1,24 +0,0 @@ -// -// Copyright (C) 2021 The LineageOS 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. -// - -cc_binary { - name: "secril_config_svc", - vendor: true, - srcs: ["secril_config_svc.cpp"], - shared_libs: [ - "libbase", - ], -} diff --git a/universal7885-common/bin/hardware/samsung/secril_config_svc/secril_config_svc.cpp b/universal7885-common/bin/hardware/samsung/secril_config_svc/secril_config_svc.cpp deleted file mode 100644 index 725a380..0000000 --- a/universal7885-common/bin/hardware/samsung/secril_config_svc/secril_config_svc.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2021, The LineageOS 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. - */ - -#define LOG_TAG "secril_config_svc" - -#include -#include -#include -#include - -#include - -#define EFS_OLD "/efs/" -#define EFS_NEW "/mnt/vendor/efs/" -#define FACTORY_PROP "factory.prop" -#define TELEPHONY_PROP "telephony.prop" - -void LoadProperties(std::string data) { - for (std::string line : android::base::Split(data, "\n")) { - if (line == "\0") - break; - - std::vector parts = android::base::Split(line, "="); - if (parts.size() == 2) { - LOG(INFO) << "Setting property: " << line; - android::base::SetProperty(parts.at(0), parts.at(1)); - } else { - LOG(ERROR) << "Invalid data: " << line; - } - } -} - -int main(int argc, char *argv[]) { - std::string prop = FACTORY_PROP; - - if (argc > 1 && std::string(argv[1]) == "NetworkConfig") - prop = TELEPHONY_PROP; - - std::ifstream in(EFS_NEW + prop); - if (in.good()) { - in.close(); - prop = EFS_NEW + prop; - } else { - prop = EFS_OLD + prop; - } - - LOG(INFO) << "Loading properties from " << prop; - - std::string content; - if (android::base::ReadFileToString(prop, &content)) { - LoadProperties(content.c_str()); - } else if (prop == FACTORY_PROP) { - LOG(WARNING) << "Could not read " << prop << ", setting defaults!"; - LoadProperties("ro.vendor.multisim.simslotcount=1"); - } else { - LOG(WARNING) << "Could not read " << prop << "!"; - } -} diff --git a/universal7885-common/bin/hardware/samsung/sensors/Android.bp b/universal7885-common/bin/hardware/samsung/sensors/Android.bp deleted file mode 100644 index 0161a84..0000000 --- a/universal7885-common/bin/hardware/samsung/sensors/Android.bp +++ /dev/null @@ -1,20 +0,0 @@ -cc_library_shared { - name: "android.hardware.sensors@1.0-impl.samsung", - defaults: ["hidl_defaults"], - proprietary: true, - relative_install_path: "hw", - srcs: ["Sensors.cpp"], - shared_libs: [ - "liblog", - "libcutils", - "libhardware", - "libbase", - "libutils", - "libhidlbase", - "android.hardware.sensors@1.0", - ], - static_libs: [ - "android.hardware.sensors@1.0-convert", - "multihal", - ], -} diff --git a/universal7885-common/bin/hardware/samsung/sensors/Sensors.cpp b/universal7885-common/bin/hardware/samsung/sensors/Sensors.cpp deleted file mode 100644 index ea42df0..0000000 --- a/universal7885-common/bin/hardware/samsung/sensors/Sensors.cpp +++ /dev/null @@ -1,366 +0,0 @@ -/* - * Copyright (C) 2016 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. - */ - -// #define VERBOSE - -#include "Sensors.h" -#include "multihal.h" -#include - -#include - -#include - -namespace android { -namespace hardware { -namespace sensors { -namespace V1_0 { -namespace implementation { - -/* - * If a multi-hal configuration file exists in the proper location, - * return true indicating we need to use multi-hal functionality. - */ -static bool UseMultiHal() { - const std::string &name = MULTI_HAL_CONFIG_FILE_PATH; - struct stat buffer; - return (stat(name.c_str(), &buffer) == 0); -} - -static Result ResultFromStatus(status_t err) { - switch (err) { - case OK: - return Result::OK; - case PERMISSION_DENIED: - return Result::PERMISSION_DENIED; - case NO_MEMORY: - return Result::NO_MEMORY; - case BAD_VALUE: - return Result::BAD_VALUE; - default: - return Result::INVALID_OPERATION; - } -} - -Sensors::Sensors() - : mInitCheck(NO_INIT), mSensorModule(nullptr), mSensorDevice(nullptr) { - status_t err = OK; - if (UseMultiHal()) { - mSensorModule = ::get_multi_hal_module_info(); - } else { - err = hw_get_module(SENSORS_HARDWARE_MODULE_ID, - (hw_module_t const **)&mSensorModule); - } - if (mSensorModule == NULL) { - err = UNKNOWN_ERROR; - } - - if (err != OK) { - LOG(ERROR) << "Couldn't load " << SENSORS_HARDWARE_MODULE_ID << " module (" - << strerror(-err) << ")"; - - mInitCheck = err; - return; - } - - err = sensors_open_1(&mSensorModule->common, &mSensorDevice); - - if (err != OK) { - LOG(ERROR) << "Couldn't open device for module " - << SENSORS_HARDWARE_MODULE_ID << " (" << strerror(-err) << ")"; - - mInitCheck = err; - return; - } - - // Require all the old HAL APIs to be present except for injection, which - // is considered optional. - CHECK_GE(getHalDeviceVersion(), SENSORS_DEVICE_API_VERSION_1_3); - - if (getHalDeviceVersion() == SENSORS_DEVICE_API_VERSION_1_4) { - if (mSensorDevice->inject_sensor_data == nullptr) { - LOG(ERROR) << "HAL specifies version 1.4, but does not implement " - "inject_sensor_data()"; - } - if (mSensorModule->set_operation_mode == nullptr) { - LOG(ERROR) << "HAL specifies version 1.4, but does not implement " - "set_operation_mode()"; - } - } - - /* Get us all sensors */ - setOperationMode(static_cast(5555)); - - mInitCheck = OK; -} - -status_t Sensors::initCheck() const { return mInitCheck; } - -Return Sensors::getSensorsList(getSensorsList_cb _hidl_cb) { - sensor_t const *list; - size_t count = mSensorModule->get_sensors_list(mSensorModule, &list); - - hidl_vec out; - out.resize(count); - - for (size_t i = 0; i < count; ++i) { - const sensor_t *src = &list[i]; - SensorInfo *dst = &out[i]; - - convertFromSensor(*src, dst); - - if (dst->requiredPermission == "com.samsung.permission.SSENSOR") { - dst->requiredPermission = ""; - } - - if (dst->typeAsString == "com.samsung.sensor.physical_proximity") { - LOG(INFO) << "Fixing com.samsung.sensor.physical_proximity"; - dst->type = SensorType::PROXIMITY; - dst->typeAsString = SENSOR_STRING_TYPE_PROXIMITY; - dst->maxRange = 1; - } - -#ifdef VERBOSE - LOG(INFO) << "SENSOR NAME: " << dst->name; - LOG(INFO) << " VENDOR: " << dst->name; - LOG(INFO) << " TYPE: " << (uint32_t)dst->type; - LOG(INFO) << " TYPE_AS_STRING: " << dst->typeAsString; - LOG(INFO) << " FLAGS: " << std::hex << dst->flags; - LOG(INFO) << ""; -#endif - } - - _hidl_cb(out); - - return Void(); -} - -int Sensors::getHalDeviceVersion() const { - if (!mSensorDevice) { - return -1; - } - - return mSensorDevice->common.version; -} - -Return Sensors::setOperationMode(OperationMode mode) { - if (getHalDeviceVersion() < SENSORS_DEVICE_API_VERSION_1_4 || - mSensorModule->set_operation_mode == nullptr) { - return Result::INVALID_OPERATION; - } - return ResultFromStatus(mSensorModule->set_operation_mode((uint32_t)mode)); -} - -Return Sensors::activate(int32_t sensor_handle, bool enabled) { - return ResultFromStatus(mSensorDevice->activate( - reinterpret_cast(mSensorDevice), sensor_handle, - enabled)); -} - -Return Sensors::poll(int32_t maxCount, poll_cb _hidl_cb) { - hidl_vec out; - hidl_vec dynamicSensorsAdded; - - std::unique_ptr data; - int err = android::NO_ERROR; - - { // scope of reentry lock - - // This enforces a single client, meaning that a maximum of one client can - // call poll(). If this function is re-entred, it means that we are stuck in - // a state that may prevent the system from proceeding normally. - // - // Exit and let the system restart the sensor-hal-implementation hidl - // service. - // - // This function must not call _hidl_cb(...) or return until there is no - // risk of blocking. - std::unique_lock lock(mPollLock, std::try_to_lock); - if (!lock.owns_lock()) { - // cannot get the lock, hidl service will go into deadlock if it is not - // restarted. This is guaranteed to not trigger in passthrough mode. - LOG(ERROR) << "ISensors::poll() re-entry. I do not know what to do " - "except killing myself."; - ::exit(-1); - } - - if (maxCount <= 0) { - err = android::BAD_VALUE; - } else { - int bufferSize = - maxCount <= kPollMaxBufferSize ? maxCount : kPollMaxBufferSize; - data.reset(new sensors_event_t[bufferSize]); - err = mSensorDevice->poll( - reinterpret_cast(mSensorDevice), data.get(), - bufferSize); - } - } - - if (err < 0) { - _hidl_cb(ResultFromStatus(err), out, dynamicSensorsAdded); - return Void(); - } - - const size_t count = (size_t)err; - - for (size_t i = 0; i < count; ++i) { - if (data[i].type != SENSOR_TYPE_DYNAMIC_SENSOR_META) { - continue; - } - - const dynamic_sensor_meta_event_t *dyn = &data[i].dynamic_sensor_meta; - - if (!dyn->connected) { - continue; - } - - CHECK(dyn->sensor != nullptr); - CHECK_EQ(dyn->sensor->handle, dyn->handle); - - SensorInfo info; - convertFromSensor(*dyn->sensor, &info); - - size_t numDynamicSensors = dynamicSensorsAdded.size(); - dynamicSensorsAdded.resize(numDynamicSensors + 1); - dynamicSensorsAdded[numDynamicSensors] = info; - } - - out.resize(count); - convertFromSensorEvents(err, data.get(), &out); - - _hidl_cb(Result::OK, out, dynamicSensorsAdded); - - return Void(); -} - -Return Sensors::batch(int32_t sensor_handle, int64_t sampling_period_ns, - int64_t max_report_latency_ns) { - return ResultFromStatus( - mSensorDevice->batch(mSensorDevice, sensor_handle, 0, /*flags*/ - sampling_period_ns, max_report_latency_ns)); -} - -Return Sensors::flush(int32_t sensor_handle) { - return ResultFromStatus(mSensorDevice->flush(mSensorDevice, sensor_handle)); -} - -Return Sensors::injectSensorData(const Event &event) { - if (getHalDeviceVersion() < SENSORS_DEVICE_API_VERSION_1_4 || - mSensorDevice->inject_sensor_data == nullptr) { - return Result::INVALID_OPERATION; - } - - sensors_event_t out; - convertToSensorEvent(event, &out); - - return ResultFromStatus( - mSensorDevice->inject_sensor_data(mSensorDevice, &out)); -} - -Return Sensors::registerDirectChannel(const SharedMemInfo &mem, - registerDirectChannel_cb _hidl_cb) { - if (mSensorDevice->register_direct_channel == nullptr || - mSensorDevice->config_direct_report == nullptr) { - // HAL does not support - _hidl_cb(Result::INVALID_OPERATION, -1); - return Void(); - } - - sensors_direct_mem_t m; - if (!convertFromSharedMemInfo(mem, &m)) { - _hidl_cb(Result::BAD_VALUE, -1); - return Void(); - } - - int err = mSensorDevice->register_direct_channel(mSensorDevice, &m, -1); - - if (err < 0) { - _hidl_cb(ResultFromStatus(err), -1); - } else { - int32_t channelHandle = static_cast(err); - _hidl_cb(Result::OK, channelHandle); - } - return Void(); -} - -Return Sensors::unregisterDirectChannel(int32_t channelHandle) { - if (mSensorDevice->register_direct_channel == nullptr || - mSensorDevice->config_direct_report == nullptr) { - // HAL does not support - return Result::INVALID_OPERATION; - } - - mSensorDevice->register_direct_channel(mSensorDevice, nullptr, channelHandle); - - return Result::OK; -} - -Return Sensors::configDirectReport(int32_t sensorHandle, - int32_t channelHandle, RateLevel rate, - configDirectReport_cb _hidl_cb) { - if (mSensorDevice->register_direct_channel == nullptr || - mSensorDevice->config_direct_report == nullptr) { - // HAL does not support - _hidl_cb(Result::INVALID_OPERATION, -1); - return Void(); - } - - sensors_direct_cfg_t cfg = {.rate_level = convertFromRateLevel(rate)}; - if (cfg.rate_level < 0) { - _hidl_cb(Result::BAD_VALUE, -1); - return Void(); - } - - int err = mSensorDevice->config_direct_report(mSensorDevice, sensorHandle, - channelHandle, &cfg); - - if (rate == RateLevel::STOP) { - _hidl_cb(ResultFromStatus(err), -1); - } else { - _hidl_cb(err > 0 ? Result::OK : ResultFromStatus(err), err); - } - return Void(); -} - -// static -void Sensors::convertFromSensorEvents(size_t count, - const sensors_event_t *srcArray, - hidl_vec *dstVec) { - for (size_t i = 0; i < count; ++i) { - const sensors_event_t &src = srcArray[i]; - Event *dst = &(*dstVec)[i]; - - convertFromSensorEvent(src, dst); - } -} - -ISensors *HIDL_FETCH_ISensors(const char * /* hal */) { - Sensors *sensors = new Sensors; - if (sensors->initCheck() != OK) { - delete sensors; - sensors = nullptr; - - return nullptr; - } - - return sensors; -} - -} // namespace implementation -} // namespace V1_0 -} // namespace sensors -} // namespace hardware -} // namespace android diff --git a/universal7885-common/bin/hardware/samsung/sensors/Sensors.h b/universal7885-common/bin/hardware/samsung/sensors/Sensors.h deleted file mode 100644 index f627967..0000000 --- a/universal7885-common/bin/hardware/samsung/sensors/Sensors.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2016 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. - */ - -#ifndef HARDWARE_INTERFACES_SENSORS_V1_0_SAMSUNG_SENSORS_H_ - -#define HARDWARE_INTERFACES_SENSORS_V1_0_SAMSUNG_SENSORS_H_ - -#include -#include -#include -#include - -namespace android { -namespace hardware { -namespace sensors { -namespace V1_0 { -namespace implementation { - -struct Sensors : public ::android::hardware::sensors::V1_0::ISensors { - Sensors(); - - status_t initCheck() const; - - Return getSensorsList(getSensorsList_cb _hidl_cb) override; - - Return setOperationMode(OperationMode mode) override; - - Return activate(int32_t sensor_handle, bool enabled) override; - - Return poll(int32_t maxCount, poll_cb _hidl_cb) override; - - Return batch(int32_t sensor_handle, int64_t sampling_period_ns, - int64_t max_report_latency_ns) override; - - Return flush(int32_t sensor_handle) override; - - Return injectSensorData(const Event &event) override; - - Return - registerDirectChannel(const SharedMemInfo &mem, - registerDirectChannel_cb _hidl_cb) override; - - Return unregisterDirectChannel(int32_t channelHandle) override; - - Return configDirectReport(int32_t sensorHandle, int32_t channelHandle, - RateLevel rate, - configDirectReport_cb _hidl_cb) override; - -private: - static constexpr int32_t kPollMaxBufferSize = 128; - status_t mInitCheck; - sensors_module_t *mSensorModule; - sensors_poll_device_1_t *mSensorDevice; - std::mutex mPollLock; - - int getHalDeviceVersion() const; - - static void convertFromSensorEvents(size_t count, const sensors_event_t *src, - hidl_vec *dst); - - DISALLOW_COPY_AND_ASSIGN(Sensors); -}; - -extern "C" ISensors *HIDL_FETCH_ISensors(const char *name); - -} // namespace implementation -} // namespace V1_0 -} // namespace sensors -} // namespace hardware -} // namespace android - -#endif // HARDWARE_INTERFACES_SENSORS_V1_0_SAMSUNG_SENSORS_H_ diff --git a/universal7885-common/bin/hardware/samsung/vibrator/Android.bp b/universal7885-common/bin/hardware/samsung/vibrator/Android.bp deleted file mode 100644 index 097301c..0000000 --- a/universal7885-common/bin/hardware/samsung/vibrator/Android.bp +++ /dev/null @@ -1,22 +0,0 @@ -// -// Copyright (C) 2021 The LineageOS Project -// -// SPDX-License-Identifier: Apache-2.0 -// - -cc_binary { - name: "android.hardware.vibrator-service.samsung", - relative_install_path: "hw", - init_rc: ["android.hardware.vibrator-service.samsung.rc"], - vintf_fragments: ["android.hardware.vibrator-service.samsung.xml"], - srcs: [ - "Vibrator.cpp", - "service.cpp", - ], - shared_libs: [ - "libbase", - "libbinder_ndk", - "android.hardware.vibrator-V2-ndk_platform", - ], - vendor: true, -} diff --git a/universal7885-common/bin/hardware/samsung/vibrator/Vibrator.cpp b/universal7885-common/bin/hardware/samsung/vibrator/Vibrator.cpp deleted file mode 100644 index fea147d..0000000 --- a/universal7885-common/bin/hardware/samsung/vibrator/Vibrator.cpp +++ /dev/null @@ -1,343 +0,0 @@ -/* - * Copyright (C) 2021 The LineageOS Project - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include "Vibrator.h" - -#include - -#include -#include -#include -#include -#include - -namespace aidl { -namespace android { -namespace hardware { -namespace vibrator { - -static std::map CP_TRIGGER_EFFECTS{{Effect::CLICK, 10}, - {Effect::DOUBLE_CLICK, 14}, - {Effect::HEAVY_CLICK, 23}, - {Effect::TEXTURE_TICK, 50}, - {Effect::TICK, 50}}; - -/* - * Write value to path and close file. - */ -template -static ndk::ScopedAStatus writeNode(const std::string &path, const T &value) { - std::ofstream node(path); - if (!node) { - LOG(ERROR) << "Failed to open: " << path; - return ndk::ScopedAStatus::fromStatus(STATUS_UNKNOWN_ERROR); - } - - LOG(DEBUG) << "writeNode node: " << path << " value: " << value; - - node << value << std::endl; - if (!node) { - LOG(ERROR) << "Failed to write: " << value; - return ndk::ScopedAStatus::fromStatus(STATUS_UNKNOWN_ERROR); - } - - return ndk::ScopedAStatus::ok(); -} - -static bool nodeExists(const std::string &path) { - std::ofstream f(path.c_str()); - return f.good(); -} - -Vibrator::Vibrator() { - mIsTimedOutVibrator = nodeExists(VIBRATOR_TIMEOUT_PATH); - mHasTimedOutIntensity = nodeExists(VIBRATOR_INTENSITY_PATH); - mHasTimedOutEffect = nodeExists(VIBRATOR_CP_TRIGGER_PATH); -} - -ndk::ScopedAStatus Vibrator::getCapabilities(int32_t *_aidl_return) { - *_aidl_return = - IVibrator::CAP_ON_CALLBACK | IVibrator::CAP_PERFORM_CALLBACK | - IVibrator::CAP_EXTERNAL_CONTROL /*| IVibrator::CAP_COMPOSE_EFFECTS | - IVibrator::CAP_ALWAYS_ON_CONTROL*/ - ; - - if (mHasTimedOutIntensity) { - *_aidl_return = *_aidl_return | IVibrator::CAP_AMPLITUDE_CONTROL | - IVibrator::CAP_EXTERNAL_AMPLITUDE_CONTROL; - } - - return ndk::ScopedAStatus::ok(); -} - -ndk::ScopedAStatus Vibrator::off() { return activate(0); } - -ndk::ScopedAStatus -Vibrator::on(int32_t timeoutMs, - const std::shared_ptr &callback) { - ndk::ScopedAStatus status; - - if (mHasTimedOutEffect) - writeNode(VIBRATOR_CP_TRIGGER_PATH, 0); // Clear all effects - - status = activate(timeoutMs); - - if (callback != nullptr) { - std::thread([=] { - LOG(DEBUG) << "Starting on on another thread"; - usleep(timeoutMs * 1000); - LOG(DEBUG) << "Notifying on complete"; - if (!callback->onComplete().isOk()) { - LOG(ERROR) << "Failed to call onComplete"; - } - }).detach(); - } - - return status; -} - -ndk::ScopedAStatus -Vibrator::perform(Effect effect, EffectStrength strength, - const std::shared_ptr &callback, - int32_t *_aidl_return) { - ndk::ScopedAStatus status; - uint32_t amplitude = strengthToAmplitude(strength, &status); - uint32_t ms = 1000; - - if (!status.isOk()) - return status; - - activate(0); - setAmplitude(amplitude); - - if (mHasTimedOutEffect && - CP_TRIGGER_EFFECTS.find(effect) != CP_TRIGGER_EFFECTS.end()) { - writeNode(VIBRATOR_CP_TRIGGER_PATH, CP_TRIGGER_EFFECTS[effect]); - } else { - if (mHasTimedOutEffect) - writeNode(VIBRATOR_CP_TRIGGER_PATH, 0); // Clear previous effect - - ms = effectToMs(effect, &status); - - if (!status.isOk()) - return status; - } - - status = activate(ms); - - if (callback != nullptr) { - std::thread([=] { - LOG(DEBUG) << "Starting perform on another thread"; - usleep(ms * 1000); - LOG(DEBUG) << "Notifying perform complete"; - callback->onComplete(); - }).detach(); - } - - *_aidl_return = ms; - return status; -} - -ndk::ScopedAStatus -Vibrator::getSupportedEffects(std::vector *_aidl_return) { - *_aidl_return = { - Effect::CLICK, Effect::DOUBLE_CLICK, Effect::HEAVY_CLICK, - Effect::TICK, Effect::TEXTURE_TICK, Effect::THUD, - Effect::POP, Effect::RINGTONE_1, Effect::RINGTONE_2, - Effect::RINGTONE_3, Effect::RINGTONE_4, Effect::RINGTONE_5, - Effect::RINGTONE_6, Effect::RINGTONE_7, Effect::RINGTONE_7, - Effect::RINGTONE_8, Effect::RINGTONE_9, Effect::RINGTONE_10, - Effect::RINGTONE_11, Effect::RINGTONE_12, Effect::RINGTONE_13, - Effect::RINGTONE_14, Effect::RINGTONE_15}; - return ndk::ScopedAStatus::ok(); -} - -ndk::ScopedAStatus Vibrator::setAmplitude(float amplitude) { - uint32_t intensity; - - if (amplitude == 0) { - return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT); - } - - LOG(DEBUG) << "Setting amplitude: " << (uint32_t)amplitude; - - intensity = std::lround((amplitude - 1) * INTENSITY_MAX / 254.0); - if (intensity > INTENSITY_MAX) { - intensity = INTENSITY_MAX; - } - - if (intensity == 0) { - return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT); - } - - LOG(DEBUG) << "Setting intensity: " << intensity; - - if (mHasTimedOutIntensity) { - return writeNode(VIBRATOR_INTENSITY_PATH, intensity); - } - - return ndk::ScopedAStatus::ok(); -} - -ndk::ScopedAStatus Vibrator::setExternalControl(bool enabled) { - if (mEnabled) { - LOG(WARNING) << "Setting external control while the vibrator is enabled is " - "unsupported!"; - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); - } - - LOG(INFO) << "ExternalControl: " << mExternalControl << " -> " << enabled; - mExternalControl = enabled; - return ndk::ScopedAStatus::ok(); -} - -ndk::ScopedAStatus -Vibrator::getCompositionDelayMax(int32_t * /*_aidl_return*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus Vibrator::getCompositionSizeMax(int32_t * /*_aidl_return*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus Vibrator::getSupportedPrimitives( - std::vector * /*_aidl_return*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus -Vibrator::getPrimitiveDuration(CompositePrimitive /*primitive*/, - int32_t * /*_aidl_return*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus -Vibrator::compose(const std::vector & /*composite*/, - const std::shared_ptr & /*callback*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus -Vibrator::getSupportedAlwaysOnEffects(std::vector * /*_aidl_return*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus Vibrator::alwaysOnEnable(int32_t /*id*/, Effect /*effect*/, - EffectStrength /*strength*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus Vibrator::alwaysOnDisable(int32_t /*id*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus Vibrator::getResonantFrequency(float * /*_aidl_return*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus Vibrator::getQFactor(float * /*_aidl_return*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus Vibrator::getFrequencyResolution(float * /*_aidl_return*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus Vibrator::getFrequencyMinimum(float * /*_aidl_return*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus -Vibrator::getBandwidthAmplitudeMap(std::vector * /*_aidl_return*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus -Vibrator::getPwlePrimitiveDurationMax(int32_t * /*_aidl_return*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus -Vibrator::getPwleCompositionSizeMax(int32_t * /*_aidl_return*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus -Vibrator::getSupportedBraking(std::vector * /*_aidl_return*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus -Vibrator::composePwle(const std::vector & /*composite*/, - const std::shared_ptr & /*callback*/) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); -} - -ndk::ScopedAStatus Vibrator::activate(uint32_t timeoutMs) { - std::lock_guard lock{mMutex}; - if (!mIsTimedOutVibrator) { - return ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); - } - - return writeNode(VIBRATOR_TIMEOUT_PATH, timeoutMs); -} - -uint8_t Vibrator::strengthToAmplitude(EffectStrength strength, - ndk::ScopedAStatus *status) { - *status = ndk::ScopedAStatus::ok(); - - switch (strength) { - case EffectStrength::LIGHT: - return 64; - case EffectStrength::MEDIUM: - return 128; - case EffectStrength::STRONG: - return 255; - } - - *status = ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); - return 0; -} - -uint32_t Vibrator::effectToMs(Effect effect, ndk::ScopedAStatus *status) { - *status = ndk::ScopedAStatus::ok(); - switch (effect) { - case Effect::CLICK: - return 10; - case Effect::DOUBLE_CLICK: - return 15; - case Effect::TICK: - case Effect::TEXTURE_TICK: - case Effect::THUD: - case Effect::POP: - return 5; - case Effect::HEAVY_CLICK: - return 10; - case Effect::RINGTONE_1: - case Effect::RINGTONE_2: - case Effect::RINGTONE_3: - case Effect::RINGTONE_4: - case Effect::RINGTONE_5: - case Effect::RINGTONE_6: - case Effect::RINGTONE_7: - case Effect::RINGTONE_8: - case Effect::RINGTONE_9: - case Effect::RINGTONE_10: - case Effect::RINGTONE_11: - case Effect::RINGTONE_12: - case Effect::RINGTONE_13: - case Effect::RINGTONE_14: - case Effect::RINGTONE_15: - return 30000; - } - *status = ndk::ScopedAStatus::fromExceptionCode(EX_UNSUPPORTED_OPERATION); - return 0; -} - -} // namespace vibrator -} // namespace hardware -} // namespace android -} // namespace aidl diff --git a/universal7885-common/bin/hardware/samsung/vibrator/Vibrator.h b/universal7885-common/bin/hardware/samsung/vibrator/Vibrator.h deleted file mode 100644 index fbaca0a..0000000 --- a/universal7885-common/bin/hardware/samsung/vibrator/Vibrator.h +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) 2021 The LineageOS Project - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#pragma once - -#include - -#define INTENSITY_MIN 1000 -#define INTENSITY_MAX 10000 -#define INTENSITY_DEFAULT INTENSITY_MAX - -#define VIBRATOR_TIMEOUT_PATH "/sys/class/timed_output/vibrator/enable" -#define VIBRATOR_INTENSITY_PATH "/sys/class/timed_output/vibrator/intensity" -#define VIBRATOR_CP_TRIGGER_PATH \ - "/sys/class/timed_output/vibrator/cp_trigger_index" - -using ::aidl::android::hardware::vibrator::Braking; -using ::aidl::android::hardware::vibrator::CompositeEffect; -using ::aidl::android::hardware::vibrator::CompositePrimitive; -using ::aidl::android::hardware::vibrator::Effect; -using ::aidl::android::hardware::vibrator::EffectStrength; -using ::aidl::android::hardware::vibrator::IVibratorCallback; -using ::aidl::android::hardware::vibrator::PrimitivePwle; - -namespace aidl { -namespace android { -namespace hardware { -namespace vibrator { - -class Vibrator : public BnVibrator { -public: - Vibrator(); - ndk::ScopedAStatus getCapabilities(int32_t *_aidl_return) override; - ndk::ScopedAStatus off() override; - ndk::ScopedAStatus - on(int32_t timeoutMs, - const std::shared_ptr &callback) override; - ndk::ScopedAStatus perform(Effect effect, EffectStrength strength, - const std::shared_ptr &callback, - int32_t *_aidl_return) override; - ndk::ScopedAStatus - getSupportedEffects(std::vector *_aidl_return) override; - ndk::ScopedAStatus setAmplitude(float amplitude) override; - ndk::ScopedAStatus setExternalControl(bool enabled) override; - ndk::ScopedAStatus getCompositionDelayMax(int32_t *_aidl_return) override; - ndk::ScopedAStatus getCompositionSizeMax(int32_t *_aidl_return) override; - ndk::ScopedAStatus getSupportedPrimitives( - std::vector *_aidl_return) override; - ndk::ScopedAStatus getPrimitiveDuration(CompositePrimitive primitive, - int32_t *_aidl_return) override; - ndk::ScopedAStatus - compose(const std::vector &composite, - const std::shared_ptr &callback) override; - ndk::ScopedAStatus - getSupportedAlwaysOnEffects(std::vector *_aidl_return) override; - ndk::ScopedAStatus alwaysOnEnable(int32_t id, Effect effect, - EffectStrength strength) override; - ndk::ScopedAStatus alwaysOnDisable(int32_t id) override; - ndk::ScopedAStatus getResonantFrequency(float *_aidl_return) override; - ndk::ScopedAStatus getQFactor(float *_aidl_return) override; - ndk::ScopedAStatus getFrequencyResolution(float *_aidl_return) override; - ndk::ScopedAStatus getFrequencyMinimum(float *_aidl_return) override; - ndk::ScopedAStatus - getBandwidthAmplitudeMap(std::vector *_aidl_return) override; - ndk::ScopedAStatus - getPwlePrimitiveDurationMax(int32_t *_aidl_return) override; - ndk::ScopedAStatus getPwleCompositionSizeMax(int32_t *_aidl_return) override; - ndk::ScopedAStatus - getSupportedBraking(std::vector *_aidl_return) override; - ndk::ScopedAStatus - composePwle(const std::vector &composite, - const std::shared_ptr &callback) override; - -private: - ndk::ScopedAStatus activate(uint32_t ms); - static uint32_t effectToMs(Effect effect, ndk::ScopedAStatus *status); - static uint8_t strengthToAmplitude(EffectStrength strength, - ndk::ScopedAStatus *status); - - bool mEnabled{false}; - bool mExternalControl{false}; - std::mutex mMutex; - - bool mIsTimedOutVibrator; - bool mHasTimedOutIntensity; - bool mHasTimedOutEffect; -}; - -} // namespace vibrator -} // namespace hardware -} // namespace android -} // namespace aidl diff --git a/universal7885-common/bin/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.rc b/universal7885-common/bin/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.rc deleted file mode 100644 index f211456..0000000 --- a/universal7885-common/bin/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.rc +++ /dev/null @@ -1,10 +0,0 @@ -on init - chown system system /sys/class/timed_output/vibrator/cp_trigger_index - chown system system /sys/class/timed_output/vibrator/enable - chown system system /sys/class/timed_output/vibrator/intensity - -service vendor.vibrator-default /vendor/bin/hw/android.hardware.vibrator-service.samsung - class hal - user system - group system - shutdown critical diff --git a/universal7885-common/bin/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.xml b/universal7885-common/bin/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.xml deleted file mode 100644 index 223878f..0000000 --- a/universal7885-common/bin/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - android.hardware.vibrator - IVibrator/default - - diff --git a/universal7885-common/bin/hardware/samsung/vibrator/service.cpp b/universal7885-common/bin/hardware/samsung/vibrator/service.cpp deleted file mode 100644 index a106049..0000000 --- a/universal7885-common/bin/hardware/samsung/vibrator/service.cpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2021 The LineageOS Project - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include "Vibrator.h" - -#include -#include -#include - -using ::aidl::android::hardware::vibrator::Vibrator; - -int main() { - ABinderProcess_setThreadPoolMaxThreadCount(0); - std::shared_ptr vibrator = ndk::SharedRefBase::make(); - - const std::string instance = - std::string() + Vibrator::descriptor + "/default"; - binder_status_t status = - AServiceManager_addService(vibrator->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); - - ABinderProcess_joinThreadPool(); - return EXIT_FAILURE; // should not reach -} diff --git a/universal7885-common/bin/hardware/samsung/camera/provider/Android.bp b/universal7885-common/camera/provider/Android.bp similarity index 100% rename from universal7885-common/bin/hardware/samsung/camera/provider/Android.bp rename to universal7885-common/camera/provider/Android.bp diff --git a/universal7885-common/bin/hardware/samsung/camera/provider/SamsungCameraProvider.cpp b/universal7885-common/camera/provider/SamsungCameraProvider.cpp similarity index 100% rename from universal7885-common/bin/hardware/samsung/camera/provider/SamsungCameraProvider.cpp rename to universal7885-common/camera/provider/SamsungCameraProvider.cpp diff --git a/universal7885-common/bin/hardware/samsung/camera/provider/SamsungCameraProvider.h b/universal7885-common/camera/provider/SamsungCameraProvider.h similarity index 100% rename from universal7885-common/bin/hardware/samsung/camera/provider/SamsungCameraProvider.h rename to universal7885-common/camera/provider/SamsungCameraProvider.h diff --git a/universal7885-common/bin/hardware/samsung/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc b/universal7885-common/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc similarity index 100% rename from universal7885-common/bin/hardware/samsung/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc rename to universal7885-common/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc diff --git a/universal7885-common/bin/hardware/samsung/camera/provider/service.cpp b/universal7885-common/camera/provider/service.cpp similarity index 100% rename from universal7885-common/bin/hardware/samsung/camera/provider/service.cpp rename to universal7885-common/camera/provider/service.cpp diff --git a/universal7885-common/bin/eklogger/Android.bp b/universal7885-common/eklogger/Android.bp similarity index 100% rename from universal7885-common/bin/eklogger/Android.bp rename to universal7885-common/eklogger/Android.bp diff --git a/universal7885-common/bin/eklogger/Logger.cpp b/universal7885-common/eklogger/Logger.cpp similarity index 100% rename from universal7885-common/bin/eklogger/Logger.cpp rename to universal7885-common/eklogger/Logger.cpp diff --git a/universal7885-common/bin/eklogger/eklogger.rc b/universal7885-common/eklogger/eklogger.rc similarity index 100% rename from universal7885-common/bin/eklogger/eklogger.rc rename to universal7885-common/eklogger/eklogger.rc diff --git a/universal7885-common/bin/hardware/interfaces/Android.bp b/universal7885-common/interfaces/Android.bp similarity index 100% rename from universal7885-common/bin/hardware/interfaces/Android.bp rename to universal7885-common/interfaces/Android.bp diff --git a/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.0/Android.bp b/universal7885-common/interfaces/hardware/fmradio/1.0/Android.bp similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.0/Android.bp rename to universal7885-common/interfaces/hardware/fmradio/1.0/Android.bp diff --git a/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.0/IFMRadio.hal b/universal7885-common/interfaces/hardware/fmradio/1.0/IFMRadio.hal similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.0/IFMRadio.hal rename to universal7885-common/interfaces/hardware/fmradio/1.0/IFMRadio.hal diff --git a/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.0/types.hal b/universal7885-common/interfaces/hardware/fmradio/1.0/types.hal similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.0/types.hal rename to universal7885-common/interfaces/hardware/fmradio/1.0/types.hal diff --git a/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.1/Android.bp b/universal7885-common/interfaces/hardware/fmradio/1.1/Android.bp similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.1/Android.bp rename to universal7885-common/interfaces/hardware/fmradio/1.1/Android.bp diff --git a/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.1/IFMRadio.hal b/universal7885-common/interfaces/hardware/fmradio/1.1/IFMRadio.hal similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.1/IFMRadio.hal rename to universal7885-common/interfaces/hardware/fmradio/1.1/IFMRadio.hal diff --git a/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.1/types.hal b/universal7885-common/interfaces/hardware/fmradio/1.1/types.hal similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.1/types.hal rename to universal7885-common/interfaces/hardware/fmradio/1.1/types.hal diff --git a/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/Android.bp b/universal7885-common/interfaces/hardware/fmradio/1.2/Android.bp similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/Android.bp rename to universal7885-common/interfaces/hardware/fmradio/1.2/Android.bp diff --git a/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/IFMRadio.hal b/universal7885-common/interfaces/hardware/fmradio/1.2/IFMRadio.hal similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/IFMRadio.hal rename to universal7885-common/interfaces/hardware/fmradio/1.2/IFMRadio.hal diff --git a/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/Android.bp b/universal7885-common/interfaces/hardware/fmradio/1.2/default/Android.bp similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/Android.bp rename to universal7885-common/interfaces/hardware/fmradio/1.2/default/Android.bp diff --git a/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/FMRadio.cpp b/universal7885-common/interfaces/hardware/fmradio/1.2/default/FMRadio.cpp similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/FMRadio.cpp rename to universal7885-common/interfaces/hardware/fmradio/1.2/default/FMRadio.cpp diff --git a/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/FMRadio.h b/universal7885-common/interfaces/hardware/fmradio/1.2/default/FMRadio.h similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/FMRadio.h rename to universal7885-common/interfaces/hardware/fmradio/1.2/default/FMRadio.h diff --git a/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/service.cpp b/universal7885-common/interfaces/hardware/fmradio/1.2/default/service.cpp similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/service.cpp rename to universal7885-common/interfaces/hardware/fmradio/1.2/default/service.cpp diff --git a/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc b/universal7885-common/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc rename to universal7885-common/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc diff --git a/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2.xml b/universal7885-common/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2.xml similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2.xml rename to universal7885-common/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2.xml diff --git a/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/types.hal b/universal7885-common/interfaces/hardware/fmradio/1.2/types.hal similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/types.hal rename to universal7885-common/interfaces/hardware/fmradio/1.2/types.hal diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/Android.bp b/universal7885-common/interfaces/hardware/parts/1.0/Android.bp similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/Android.bp rename to universal7885-common/interfaces/hardware/parts/1.0/Android.bp diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/IBatteryStats.hal b/universal7885-common/interfaces/hardware/parts/1.0/IBatteryStats.hal similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/IBatteryStats.hal rename to universal7885-common/interfaces/hardware/parts/1.0/IBatteryStats.hal diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/IDisplayConfigs.hal b/universal7885-common/interfaces/hardware/parts/1.0/IDisplayConfigs.hal similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/IDisplayConfigs.hal rename to universal7885-common/interfaces/hardware/parts/1.0/IDisplayConfigs.hal diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/IFlashBrightness.hal b/universal7885-common/interfaces/hardware/parts/1.0/IFlashBrightness.hal similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/IFlashBrightness.hal rename to universal7885-common/interfaces/hardware/parts/1.0/IFlashBrightness.hal diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/ISwapOnData.hal b/universal7885-common/interfaces/hardware/parts/1.0/ISwapOnData.hal similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/ISwapOnData.hal rename to universal7885-common/interfaces/hardware/parts/1.0/ISwapOnData.hal diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Android.bp b/universal7885-common/interfaces/hardware/parts/1.0/default/Android.bp similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Android.bp rename to universal7885-common/interfaces/hardware/parts/1.0/default/Android.bp diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Battery.cpp b/universal7885-common/interfaces/hardware/parts/1.0/default/Battery.cpp similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Battery.cpp rename to universal7885-common/interfaces/hardware/parts/1.0/default/Battery.cpp diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Battery.h b/universal7885-common/interfaces/hardware/parts/1.0/default/Battery.h similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Battery.h rename to universal7885-common/interfaces/hardware/parts/1.0/default/Battery.h diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Display.cpp b/universal7885-common/interfaces/hardware/parts/1.0/default/Display.cpp similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Display.cpp rename to universal7885-common/interfaces/hardware/parts/1.0/default/Display.cpp diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Display.h b/universal7885-common/interfaces/hardware/parts/1.0/default/Display.h similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Display.h rename to universal7885-common/interfaces/hardware/parts/1.0/default/Display.h diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/FlashLight.cpp b/universal7885-common/interfaces/hardware/parts/1.0/default/FlashLight.cpp similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/FlashLight.cpp rename to universal7885-common/interfaces/hardware/parts/1.0/default/FlashLight.cpp diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/FlashLight.h b/universal7885-common/interfaces/hardware/parts/1.0/default/FlashLight.h similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/FlashLight.h rename to universal7885-common/interfaces/hardware/parts/1.0/default/FlashLight.h diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Swap.cpp b/universal7885-common/interfaces/hardware/parts/1.0/default/Swap.cpp similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Swap.cpp rename to universal7885-common/interfaces/hardware/parts/1.0/default/Swap.cpp diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Swap.h b/universal7885-common/interfaces/hardware/parts/1.0/default/Swap.h similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Swap.h rename to universal7885-common/interfaces/hardware/parts/1.0/default/Swap.h diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/service.cpp b/universal7885-common/interfaces/hardware/parts/1.0/default/service.cpp similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/service.cpp rename to universal7885-common/interfaces/hardware/parts/1.0/default/service.cpp diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc b/universal7885-common/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc rename to universal7885-common/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0.xml b/universal7885-common/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0.xml similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0.xml rename to universal7885-common/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0.xml diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/types.hal b/universal7885-common/interfaces/hardware/parts/1.0/types.hal similarity index 100% rename from universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/types.hal rename to universal7885-common/interfaces/hardware/parts/1.0/types.hal diff --git a/universal7885-common/bin/init/Android.bp b/universal7885-common/libinit/Android.bp similarity index 100% rename from universal7885-common/bin/init/Android.bp rename to universal7885-common/libinit/Android.bp diff --git a/universal7885-common/bin/init/init_universal7885.cpp b/universal7885-common/libinit/init_universal7885.cpp similarity index 100% rename from universal7885-common/bin/init/init_universal7885.cpp rename to universal7885-common/libinit/init_universal7885.cpp diff --git a/universal7885-common/bin/libshims/camera/Android.bp b/universal7885-common/libshims/camera/Android.bp similarity index 100% rename from universal7885-common/bin/libshims/camera/Android.bp rename to universal7885-common/libshims/camera/Android.bp diff --git a/universal7885-common/bin/libshims/camera/CamDevice_3_2.h b/universal7885-common/libshims/camera/CamDevice_3_2.h similarity index 100% rename from universal7885-common/bin/libshims/camera/CamDevice_3_2.h rename to universal7885-common/libshims/camera/CamDevice_3_2.h diff --git a/universal7885-common/bin/libshims/camera/CorrectCameraID.cpp b/universal7885-common/libshims/camera/CorrectCameraID.cpp similarity index 100% rename from universal7885-common/bin/libshims/camera/CorrectCameraID.cpp rename to universal7885-common/libshims/camera/CorrectCameraID.cpp diff --git a/universal7885-common/bin/libshims/sensor/ASensorManager.cpp b/universal7885-common/libshims/sensor/ASensorManager.cpp similarity index 100% rename from universal7885-common/bin/libshims/sensor/ASensorManager.cpp rename to universal7885-common/libshims/sensor/ASensorManager.cpp diff --git a/universal7885-common/bin/libshims/sensor/Android.bp b/universal7885-common/libshims/sensor/Android.bp similarity index 100% rename from universal7885-common/bin/libshims/sensor/Android.bp rename to universal7885-common/libshims/sensor/Android.bp diff --git a/universal7885-common/overlay-rom/packages/apps/Settings/res/values/rom_strings.xml.template b/universal7885-common/overlay-rom/packages/apps/Settings/res/values/rom_strings.xml.template deleted file mode 100644 index 56d9f67..0000000 --- a/universal7885-common/overlay-rom/packages/apps/Settings/res/values/rom_strings.xml.template +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/universal7885-common/bin/hardware/samsung/usb/typeb/Android.bp b/universal7885-common/usb/typeb/Android.bp similarity index 100% rename from universal7885-common/bin/hardware/samsung/usb/typeb/Android.bp rename to universal7885-common/usb/typeb/Android.bp diff --git a/universal7885-common/bin/hardware/samsung/usb/typeb/Usb.cpp b/universal7885-common/usb/typeb/Usb.cpp similarity index 100% rename from universal7885-common/bin/hardware/samsung/usb/typeb/Usb.cpp rename to universal7885-common/usb/typeb/Usb.cpp diff --git a/universal7885-common/bin/hardware/samsung/usb/typeb/Usb.h b/universal7885-common/usb/typeb/Usb.h similarity index 100% rename from universal7885-common/bin/hardware/samsung/usb/typeb/Usb.h rename to universal7885-common/usb/typeb/Usb.h diff --git a/universal7885-common/bin/hardware/samsung/usb/typeb/android.hardware.usb@1.0-service.a10.rc b/universal7885-common/usb/typeb/android.hardware.usb@1.0-service.a10.rc similarity index 100% rename from universal7885-common/bin/hardware/samsung/usb/typeb/android.hardware.usb@1.0-service.a10.rc rename to universal7885-common/usb/typeb/android.hardware.usb@1.0-service.a10.rc diff --git a/universal7885-common/bin/hardware/samsung/usb/typeb/android.hardware.usb@1.0-service.a10.xml b/universal7885-common/usb/typeb/android.hardware.usb@1.0-service.a10.xml similarity index 100% rename from universal7885-common/bin/hardware/samsung/usb/typeb/android.hardware.usb@1.0-service.a10.xml rename to universal7885-common/usb/typeb/android.hardware.usb@1.0-service.a10.xml diff --git a/universal7885-common/bin/hardware/samsung/usb/typeb/service.cpp b/universal7885-common/usb/typeb/service.cpp similarity index 100% rename from universal7885-common/bin/hardware/samsung/usb/typeb/service.cpp rename to universal7885-common/usb/typeb/service.cpp diff --git a/universal7885-common/bin/hardware/samsung/usb/typec/Android.bp b/universal7885-common/usb/typec/Android.bp similarity index 100% rename from universal7885-common/bin/hardware/samsung/usb/typec/Android.bp rename to universal7885-common/usb/typec/Android.bp diff --git a/universal7885-common/bin/hardware/samsung/usb/typec/Usb.cpp b/universal7885-common/usb/typec/Usb.cpp similarity index 100% rename from universal7885-common/bin/hardware/samsung/usb/typec/Usb.cpp rename to universal7885-common/usb/typec/Usb.cpp diff --git a/universal7885-common/bin/hardware/samsung/usb/typec/Usb.h b/universal7885-common/usb/typec/Usb.h similarity index 100% rename from universal7885-common/bin/hardware/samsung/usb/typec/Usb.h rename to universal7885-common/usb/typec/Usb.h diff --git a/universal7885-common/bin/hardware/samsung/usb/typec/android.hardware.usb@1.3-service.samsung.rc b/universal7885-common/usb/typec/android.hardware.usb@1.3-service.samsung.rc similarity index 100% rename from universal7885-common/bin/hardware/samsung/usb/typec/android.hardware.usb@1.3-service.samsung.rc rename to universal7885-common/usb/typec/android.hardware.usb@1.3-service.samsung.rc diff --git a/universal7885-common/bin/hardware/samsung/usb/typec/android.hardware.usb@1.3-service.samsung.xml b/universal7885-common/usb/typec/android.hardware.usb@1.3-service.samsung.xml similarity index 100% rename from universal7885-common/bin/hardware/samsung/usb/typec/android.hardware.usb@1.3-service.samsung.xml rename to universal7885-common/usb/typec/android.hardware.usb@1.3-service.samsung.xml diff --git a/universal7885-common/bin/hardware/samsung/usb/typec/service.cpp b/universal7885-common/usb/typec/service.cpp similarity index 100% rename from universal7885-common/bin/hardware/samsung/usb/typec/service.cpp rename to universal7885-common/usb/typec/service.cpp diff --git a/universal7885-common/vendorsetup.sh b/universal7885-common/vendorsetup.sh index af5136b..b4d63e1 100644 --- a/universal7885-common/vendorsetup.sh +++ b/universal7885-common/vendorsetup.sh @@ -10,7 +10,9 @@ git clone --depth=1 "$MODE"github.com"$SPERATOR"eurekadevelopment/Eureka-Kernel- git clone https://github.com/lineageos/android_hardware_samsung_slsi_libbt hardware/samsung_slsi/libbt git clone https://github.com/eurekadevelopment/android_hardware_samsung_slsi_scsc_wifibt_wifi_hal.git hardware/samsung_slsi/scsc_wifibt/wifi_hal git clone https://github.com/lineageos/android_hardware_samsung_slsi_scsc_wifibt_wpa_supplicant_lib hardware/samsung_slsi/scsc_wifibt/wpa_supplicant_lib -# Vendors +mv hardware/samsung/nfc . +git clone https://github.com/lineageos/android_hardware_samsung hardware/samsung +mv nfc hardware/samsung git clone --depth=1 https://github.com/eurekadevelopment/android_vendor_samsung_exynos7885.git -b master vendor/samsung if test -f device/samsung/universal7885-common/vendor_name; then rm device/samsung/universal7885-common/vendor_name