From 53b5d14b3c236a4e20c3a3e5ebefde92de97a3dc Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Wed, 5 Oct 2022 09:59:33 +0000 Subject: [PATCH] universal7885: parts-jni: Adapt to hidl changes --- .../apps/SamsungParts/jni/BatteryBridge.cpp | 30 +++++++++---------- .../apps/SamsungParts/jni/DisplayBridge.cpp | 12 ++++---- .../SamsungParts/jni/FlashlightBridge.cpp | 15 +++++----- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/universal7885-common/apps/SamsungParts/jni/BatteryBridge.cpp b/universal7885-common/apps/SamsungParts/jni/BatteryBridge.cpp index d6cedc2..ef30723 100644 --- a/universal7885-common/apps/SamsungParts/jni/BatteryBridge.cpp +++ b/universal7885-common/apps/SamsungParts/jni/BatteryBridge.cpp @@ -7,8 +7,8 @@ using android::sp; using vendor::eureka::hardware::parts::V1_0::IBatteryStats; -using vendor::eureka::hardware::parts::V1_0::Number; -using vendor::eureka::hardware::parts::V1_0::SysfsType; +using vendor::eureka::hardware::parts::V1_0::Status; +using vendor::eureka::hardware::parts::V1_0::BatterySys; enum { BATTERY_CAPACITY_MAX = 1, @@ -24,16 +24,16 @@ extern "C" JNIEXPORT void JNICALL Java_com_eurekateam_samsungextras_interfaces_Battery_setChargeSysfs( JNIEnv /*env*/, __unused jclass obj, jint enable) { if (enable == 1) { - service->setBatteryWritable(SysfsType::CHARGE, Number::ENABLE); + service->setBatteryWritable(BatterySys::CHARGE, Status::ENABLE); } else { - service->setBatteryWritable(SysfsType::CHARGE, Number::DISABLE); + service->setBatteryWritable(BatterySys::CHARGE, Status::DISABLE); } } extern "C" JNIEXPORT jint JNICALL Java_com_eurekateam_samsungextras_interfaces_Battery_getChargeSysfs( JNIEnv /*env*/, __unused jclass obj) { - int ret = service->getBatteryStats(SysfsType::CHARGE); + int ret = service->getBatteryStats(BatterySys::CHARGE); return ret; } @@ -41,15 +41,15 @@ extern "C" JNIEXPORT void JNICALL Java_com_eurekateam_samsungextras_interfaces_Battery_setFastCharge( JNIEnv /*env*/, __unused jobject obj, jint enable) { if (enable == 1) { - service->setBatteryWritable(SysfsType::FASTCHARGE, Number::ENABLE); + service->setBatteryWritable(BatterySys::FASTCHARGE, Status::ENABLE); } else { - service->setBatteryWritable(SysfsType::FASTCHARGE, Number::DISABLE); + service->setBatteryWritable(BatterySys::FASTCHARGE, Status::DISABLE); } } extern "C" JNIEXPORT jint JNICALL Java_com_eurekateam_samsungextras_interfaces_Battery_getFastChargeSysfs( JNIEnv /*env*/, __unused jclass obj) { - int ret = service->getBatteryStats(SysfsType::FASTCHARGE); + int ret = service->getBatteryStats(BatterySys::FASTCHARGE); return ret; } extern "C" JNIEXPORT jint JNICALL @@ -58,27 +58,27 @@ Java_com_eurekateam_samsungextras_interfaces_Battery_getGeneralBatteryStats( int ret; switch (id) { case BATTERY_CAPACITY_MAX: - ret = service->getBatteryStats(SysfsType::CAPACITY_MAX) / 1000; + ret = service->getBatteryStats(BatterySys::CAPACITY_MAX) / 1000; break; case BATTERY_CAPACITY_CURRENT: - ret = service->getBatteryStats(SysfsType::CAPACITY_CURRENT); + ret = service->getBatteryStats(BatterySys::CAPACITY_CURRENT); break; case BATTERY_CAPACITY_CURRENT_MAH: - ret = (float)service->getBatteryStats(SysfsType::CAPACITY_CURRENT) * - (float)service->getBatteryStats(SysfsType::CAPACITY_MAX) / 100000; + ret = (float)service->getBatteryStats(BatterySys::CAPACITY_CURRENT) * + (float)service->getBatteryStats(BatterySys::CAPACITY_MAX) / 100000; break; case CHARGING_STATE: - if (service->getBatteryStats(SysfsType::CURRENT) > 0) { + if (service->getBatteryStats(BatterySys::CURRENT) > 0) { ret = 1; } else { ret = 0; } break; case BATTERY_TEMP: - ret = service->getBatteryStats(SysfsType::TEMP) / 10; + ret = service->getBatteryStats(BatterySys::TEMP) / 10; break; case BATTERY_CURRENT: - ret = service->getBatteryStats(SysfsType::CURRENT); + ret = service->getBatteryStats(BatterySys::CURRENT); break; default: ret = -1; diff --git a/universal7885-common/apps/SamsungParts/jni/DisplayBridge.cpp b/universal7885-common/apps/SamsungParts/jni/DisplayBridge.cpp index b82f7fe..b10acea 100644 --- a/universal7885-common/apps/SamsungParts/jni/DisplayBridge.cpp +++ b/universal7885-common/apps/SamsungParts/jni/DisplayBridge.cpp @@ -6,9 +6,9 @@ #include using android::sp; -using vendor::eureka::hardware::parts::V1_0::Display; +using vendor::eureka::hardware::parts::V1_0::DisplaySys; using vendor::eureka::hardware::parts::V1_0::IDisplayConfigs; -using vendor::eureka::hardware::parts::V1_0::Number; +using vendor::eureka::hardware::parts::V1_0::Status; static android::sp service = IDisplayConfigs::getService(); @@ -17,9 +17,9 @@ Java_com_eurekateam_samsungextras_interfaces_Display_setDT2W(JNIEnv /*env*/, jclass /*clazz*/, jboolean enable) { if (enable) { - service->writeDisplay(Number::ENABLE, Display::DOUBLE_TAP); + service->writeDisplay(Status::ENABLE, DisplaySys::DOUBLE_TAP); } else { - service->writeDisplay(Number::DISABLE, Display::DOUBLE_TAP); + service->writeDisplay(Status::DISABLE, DisplaySys::DOUBLE_TAP); } } @@ -27,8 +27,8 @@ extern "C" JNIEXPORT void JNICALL Java_com_eurekateam_samsungextras_interfaces_Display_setGloveMode( JNIEnv /**env*/, jclass /*clazz*/, jboolean enable) { if (enable) { - service->writeDisplay(Number::ENABLE, Display::GLOVE_MODE); + service->writeDisplay(Status::ENABLE, DisplaySys::GLOVE_MODE); } else { - service->writeDisplay(Number::DISABLE, Display::GLOVE_MODE); + service->writeDisplay(Status::DISABLE, DisplaySys::GLOVE_MODE); } } diff --git a/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp b/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp index c91b243..109e79a 100644 --- a/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp +++ b/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp @@ -6,10 +6,9 @@ #include using android::sp; -using vendor::eureka::hardware::parts::V1_0::Device; + using vendor::eureka::hardware::parts::V1_0::IFlashBrightness; -using vendor::eureka::hardware::parts::V1_0::Number; -using vendor::eureka::hardware::parts::V1_0::Value; +using vendor::eureka::hardware::parts::V1_0::Status; static android::sp service = IFlashBrightness::getService(); @@ -17,16 +16,16 @@ extern "C" JNIEXPORT void JNICALL Java_com_eurekateam_samsungextras_interfaces_Flashlight_setEnabled( JNIEnv /*env*/, __unused jobject obj, jboolean enabled) { if (enabled) { - service->setFlashlightEnable(Number::ENABLE); + service->setFlashlightEnable(Status::ENABLE); } else { - service->setFlashlightEnable(Number::DISABLE); + service->setFlashlightEnable(Status::DISABLE); } } extern "C" JNIEXPORT void JNICALL Java_com_eurekateam_samsungextras_interfaces_Flashlight_setFlash( JNIEnv /*env*/, __unused jobject obj, jint value) { - service->setFlashlightWritable(static_cast(value)); + service->setFlashlightWritable(value); } extern "C" JNIEXPORT jint JNICALL Java_com_eurekateam_samsungextras_interfaces_Flashlight_getFlash(JNIEnv /*env*/, @@ -34,9 +33,9 @@ Java_com_eurekateam_samsungextras_interfaces_Flashlight_getFlash(JNIEnv /*env*/, jint isA10) { int ret; if (isA10 == 1) { - ret = service->readFlashlightstats(Device::A10); + ret = service->readFlashlightstats(false); } else { - ret = service->readFlashlightstats(Device::NOTA10); + ret = service->readFlashlightstats(true); } return ret; }