universal7885: parts: jni: Link against libc++ fs

Also fix Kotlin src issues
Also clang-format the cpp src
This commit is contained in:
roynatech2544 2022-04-20 11:42:35 +09:00
commit 0faf51929d
10 changed files with 57 additions and 55 deletions

View file

@ -12,6 +12,7 @@ cc_library_shared {
"libhidlbase",
"liblog",
"libutils",
"libc++fs",
"vendor.eureka.hardware.parts@1.0",
]
}

View file

@ -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<IBatteryStats> service = IBatteryStats::getService();

View file

@ -14,13 +14,13 @@ using vendor::eureka::hardware::parts::V1_0::Value;
static android::sp<IFlashBrightness> 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

View file

@ -1,21 +1,21 @@
#include <filesystem>
#include <sys/stat.h>
#include <jni.h>
#include <sys/stat.h>
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<double>(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<double>(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;
}

View file

@ -12,17 +12,18 @@ static sp<ISwapOnData> 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();
}
}

View file

@ -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

View file

@ -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
}

View file

@ -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"

View file

@ -27,26 +27,24 @@ Return<void> SwapOnData::setSwapSize(int32_t size) {
return Void();
}
Return<void> 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<void> 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<void> 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<void> 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

View file

@ -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;