Snap for 8898690 from 24e591bdd9 to udc-release

Change-Id: Iea817ad8a56266644763211fdf5441e88ad1fed6
This commit is contained in:
Android Build Coastguard Worker 2022-08-03 01:03:05 +00:00
commit ef93f6f98b
2 changed files with 25 additions and 1 deletions

View file

@ -19,6 +19,13 @@ TARGET_SCREEN_DENSITY := 420
BOARD_USES_GENERIC_AUDIO := true BOARD_USES_GENERIC_AUDIO := true
USES_DEVICE_GOOGLE_LYNX := true USES_DEVICE_GOOGLE_LYNX := true
# Enable load module in parallel
BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
# The modules which need to be loaded in sequential
BOARD_KERNEL_CMDLINE += vh_sched.load_sequential=1
BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
include device/google/gs201/BoardConfig-common.mk include device/google/gs201/BoardConfig-common.mk
-include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk -include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk

View file

@ -26,6 +26,7 @@
#include <android/binder_manager.h> #include <android/binder_manager.h>
#include <android/binder_process.h> #include <android/binder_process.h>
#include <log/log.h> #include <log/log.h>
#include <sys/stat.h>
using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider; using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider;
using aidl::android::hardware::power::stats::EnergyConsumerType; using aidl::android::hardware::power::stats::EnergyConsumerType;
@ -54,6 +55,8 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
} }
int main() { int main() {
struct stat buffer;
LOG(INFO) << "Pixel PowerStats HAL AIDL Service is starting."; LOG(INFO) << "Pixel PowerStats HAL AIDL Service is starting.";
// single thread // single thread
@ -63,7 +66,21 @@ int main() {
addGs201CommonDataProvidersQc(p); addGs201CommonDataProvidersQc(p);
addDisplay(p); addDisplay(p);
addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-2/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-2/i2c-st21nfc/power_stats");
} else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-3/i2c-st21nfc/power_stats");
} else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats");
} else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-5/i2c-st21nfc/power_stats");
} else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-6/i2c-st21nfc/power_stats");
} else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-7/i2c-st21nfc/power_stats");
} else {
addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-8/i2c-st21nfc/power_stats");
}
const std::string instance = std::string() + PowerStats::descriptor + "/default"; const std::string instance = std::string() + PowerStats::descriptor + "/default";
binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());