From 0faf51929d017b05001d021ecc4190c621445176 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Wed, 20 Apr 2022 11:42:35 +0900 Subject: [PATCH] universal7885: parts: jni: Link against libc++ fs Also fix Kotlin src issues Also clang-format the cpp src --- .../apps/SamsungParts/jni/Android.bp | 1 + .../apps/SamsungParts/jni/BatteryBridge.cpp | 12 +++---- .../SamsungParts/jni/FlashlightBridge.cpp | 14 ++++---- .../apps/SamsungParts/jni/Storage.cpp | 22 ++++++------ .../apps/SamsungParts/jni/SwapBridge.cpp | 19 ++++++----- .../samsungextras/battery/BatteryFragment.kt | 3 +- .../samsungextras/interfaces/Swap.kt | 2 +- .../samsungextras/swap/SwapFragment.kt | 3 +- .../hardware/parts/1.0/default/Swap.cpp | 34 +++++++++---------- .../hardware/parts/1.0/default/service.cpp | 2 +- 10 files changed, 57 insertions(+), 55 deletions(-) diff --git a/universal7885-common/apps/SamsungParts/jni/Android.bp b/universal7885-common/apps/SamsungParts/jni/Android.bp index 3e9adb1..980ce50 100644 --- a/universal7885-common/apps/SamsungParts/jni/Android.bp +++ b/universal7885-common/apps/SamsungParts/jni/Android.bp @@ -12,6 +12,7 @@ cc_library_shared { "libhidlbase", "liblog", "libutils", + "libc++fs", "vendor.eureka.hardware.parts@1.0", ] } diff --git a/universal7885-common/apps/SamsungParts/jni/BatteryBridge.cpp b/universal7885-common/apps/SamsungParts/jni/BatteryBridge.cpp index dd22f0f..a360ac1 100644 --- a/universal7885-common/apps/SamsungParts/jni/BatteryBridge.cpp +++ b/universal7885-common/apps/SamsungParts/jni/BatteryBridge.cpp @@ -11,12 +11,12 @@ using vendor::eureka::hardware::parts::V1_0::Number; using vendor::eureka::hardware::parts::V1_0::SysfsType; enum { - BATTERY_CAPACITY_MAX = 1, - BATTERY_CAPACITY_CURRENT, - BATTERY_CAPACITY_CURRENT_MAH, - CHARGING_STATE, - BATTERY_TEMP, - BATTERY_CURRENT = 6 + BATTERY_CAPACITY_MAX = 1, + BATTERY_CAPACITY_CURRENT, + BATTERY_CAPACITY_CURRENT_MAH, + CHARGING_STATE, + BATTERY_TEMP, + BATTERY_CURRENT = 6 }; static android::sp service = IBatteryStats::getService(); diff --git a/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp b/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp index 28131d4..79c6968 100644 --- a/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp +++ b/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp @@ -14,13 +14,13 @@ using vendor::eureka::hardware::parts::V1_0::Value; static android::sp service = IFlashBrightness::getService(); 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); - } else { - service->setFlashlightEnable(Number::DISABLE); - } +Java_com_eurekateam_samsungextras_interfaces_Flashlight_setEnabled( + JNIEnv *env, __unused jobject obj, jboolean enabled) { + if (enabled) { + service->setFlashlightEnable(Number::ENABLE); + } else { + service->setFlashlightEnable(Number::DISABLE); + } } extern "C" JNIEXPORT void JNICALL diff --git a/universal7885-common/apps/SamsungParts/jni/Storage.cpp b/universal7885-common/apps/SamsungParts/jni/Storage.cpp index 9c8766b..a96b716 100644 --- a/universal7885-common/apps/SamsungParts/jni/Storage.cpp +++ b/universal7885-common/apps/SamsungParts/jni/Storage.cpp @@ -1,21 +1,21 @@ #include -#include #include +#include namespace fs = std::filesystem; extern "C" JNIEXPORT jdouble JNICALL -Java_com_eurekateam_samsungextras_interfaces_Swap_getFreeSpace( - JNIEnv *env, jclass clazz) { - fs::space_info data = fs::space("/data"); - auto freespace = data.free / 1024 / 1024; - return static_cast(freespace) / 1024; +Java_com_eurekateam_samsungextras_interfaces_Swap_getFreeSpace(JNIEnv *env, + jclass clazz) { + fs::space_info data = fs::space("/data"); + auto freespace = data.free / 1024 / 1024; + return static_cast(freespace) / 1024; } extern "C" JNIEXPORT jlong JNICALL -Java_com_eurekateam_samsungextras_interfaces_Swap_getSwapSize( - JNIEnv *env, jclass clazz){ - struct stat stat_buf; - int rc = stat("/data/swap/swapfile", &stat_buf); - return rc == 0 ? stat_buf.st_size / 1024 / 1024 : -1; +Java_com_eurekateam_samsungextras_interfaces_Swap_getSwapSize(JNIEnv *env, + jclass clazz) { + struct stat stat_buf; + int rc = stat("/data/swap/swapfile", &stat_buf); + return rc == 0 ? stat_buf.st_size / 1024 / 1024 : -1; } diff --git a/universal7885-common/apps/SamsungParts/jni/SwapBridge.cpp b/universal7885-common/apps/SamsungParts/jni/SwapBridge.cpp index 16ed991..1eb6987 100644 --- a/universal7885-common/apps/SamsungParts/jni/SwapBridge.cpp +++ b/universal7885-common/apps/SamsungParts/jni/SwapBridge.cpp @@ -12,17 +12,18 @@ static sp service = ISwapOnData::getService(); extern "C" JNIEXPORT void JNICALL Java_com_eurekateam_samsungextras_interfaces_Swap_setSize(JNIEnv *env, - jclass clazz, - jint size) { + jclass clazz, + jint size) { service->setSwapSize(size); } extern "C" JNIEXPORT void JNICALL -Java_com_eurekateam_samsungextras_interfaces_Swap_setSwapOn( - JNIEnv *env, jclass clazz, jboolean enable) { - if (enable){ - service->setSwapOn(); - } else { - service->setSwapOff(); - } +Java_com_eurekateam_samsungextras_interfaces_Swap_setSwapOn(JNIEnv *env, + jclass clazz, + jboolean enable) { + if (enable) { + service->setSwapOn(); + } else { + service->setSwapOff(); + } } diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/battery/BatteryFragment.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/battery/BatteryFragment.kt index a047411..f86992e 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/battery/BatteryFragment.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/battery/BatteryFragment.kt @@ -61,7 +61,8 @@ class BatteryFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChang mSharedPreferences.edit().putBoolean(PREF_CHARGE, Battery.chargeSysfs == 0).apply() return true } else if (preference == mFastChargePref) { - Battery.setFastCharge(if (newValue as Boolean) 0 else 1) mFastChargePref.isChecked = Battery.fastChargeSysfs == 0 + Battery.setFastCharge(if (newValue as Boolean) 0 else 1) + mFastChargePref.isChecked = Battery.fastChargeSysfs == 0 mSharedPreferences.edit().putBoolean(PREF_FASTCHARGE, Battery.fastChargeSysfs == 0).apply() } return false diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/interfaces/Swap.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/interfaces/Swap.kt index 202d41e..46f11f8 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/interfaces/Swap.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/interfaces/Swap.kt @@ -19,6 +19,6 @@ package com.eurekateam.samsungextras.interfaces object Swap { external fun setSwapOn(mEnabled: Boolean) external fun setSize(mSize: Int) - external fun getFreeSize(): Double + external fun getFreeSpace(): Double external fun getSwapSize(): Long } diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/swap/SwapFragment.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/swap/SwapFragment.kt index 8c5de58..ff68eb0 100644 --- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/swap/SwapFragment.kt +++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/swap/SwapFragment.kt @@ -74,7 +74,8 @@ class SwapFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeLi mSwapSizePref.isEnabled = !isChecked } }.start() - } companion object { + } + companion object { const val PREF_SWAP_SIZE = "swap_size" const val PREF_SWAP_ENABLE = "swap_enable" const val INFO_FREE_SPACE = "free_space" diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Swap.cpp b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Swap.cpp index 8c74899..5fc7787 100644 --- a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Swap.cpp +++ b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Swap.cpp @@ -27,26 +27,24 @@ Return SwapOnData::setSwapSize(int32_t size) { return Void(); } -Return SwapOnData::setSwapOn(){ - string cmd = string("dd if=/dev/zero of=") + string(SWAP_PATH) + string(" bs=") + std::to_string(mSwapSize) - + "M count=10"; - system(cmd.c_str()); - cmd = string("mkswap ") + string(SWAP_PATH); - system(cmd.c_str()); - cmd = string("swapon -p 99 ") + string(SWAP_PATH); - system(cmd.c_str()); - return Void(); +Return SwapOnData::setSwapOn() { + string cmd = string("dd if=/dev/zero of=") + string(SWAP_PATH) + + string(" bs=") + std::to_string(mSwapSize) + "M count=10"; + system(cmd.c_str()); + cmd = string("mkswap ") + string(SWAP_PATH); + system(cmd.c_str()); + cmd = string("swapon -p 99 ") + string(SWAP_PATH); + system(cmd.c_str()); + return Void(); } -Return SwapOnData::setSwapOff(){ - std::string cmd = string("swapoff ") + string(SWAP_PATH); - system(cmd.c_str()); - cmd = string("rm ") + string(SWAP_PATH); - system(cmd.c_str()); - return Void(); +Return SwapOnData::setSwapOff() { + std::string cmd = string("swapoff ") + string(SWAP_PATH); + system(cmd.c_str()); + cmd = string("rm ") + string(SWAP_PATH); + system(cmd.c_str()); + return Void(); } -ISwapOnData *SwapOnData::getInstance(void) { - return new SwapOnData(); -} +ISwapOnData *SwapOnData::getInstance(void) { return new SwapOnData(); } } // namespace vendor::eureka::hardware::parts::V1_0 diff --git a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/service.cpp b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/service.cpp index 176dff0..ca94eaf 100644 --- a/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/service.cpp +++ b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/service.cpp @@ -31,11 +31,11 @@ using android::hardware::joinRpcThreadpool; using vendor::eureka::hardware::parts::V1_0::BatteryStats; using vendor::eureka::hardware::parts::V1_0::DisplayConfigs; using vendor::eureka::hardware::parts::V1_0::FlashBrightness; -using vendor::eureka::hardware::parts::V1_0::SwapOnData; using vendor::eureka::hardware::parts::V1_0::IBatteryStats; using vendor::eureka::hardware::parts::V1_0::IDisplayConfigs; using vendor::eureka::hardware::parts::V1_0::IFlashBrightness; using vendor::eureka::hardware::parts::V1_0::ISwapOnData; +using vendor::eureka::hardware::parts::V1_0::SwapOnData; int main() { int ret;