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

Also fix Kotlin src issues
Also clang-format the cpp src

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",
     ]
 }

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_MAX = 1,
-   BATTERY_CAPACITY_CURRENT,
+  BATTERY_CAPACITY_CURRENT,
-   BATTERY_CAPACITY_CURRENT_MAH,
+  BATTERY_CAPACITY_CURRENT_MAH,
-   CHARGING_STATE,
+  CHARGING_STATE,
-   BATTERY_TEMP,
+  BATTERY_TEMP,
-   BATTERY_CURRENT = 6
+  BATTERY_CURRENT = 6
 };
 
 static android::sp<IBatteryStats> service = IBatteryStats::getService();

universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp

@@ -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
+Java_com_eurekateam_samsungextras_interfaces_Flashlight_setEnabled(
-(JNIEnv *env, __unused jobject obj, jboolean enabled) {
+    JNIEnv *env, __unused jobject obj, jboolean enabled) {
-	if (enabled) {
+  if (enabled) {
-		service->setFlashlightEnable(Number::ENABLE);
+    service->setFlashlightEnable(Number::ENABLE);
-	} else {
+  } else {
-		service->setFlashlightEnable(Number::DISABLE);
+    service->setFlashlightEnable(Number::DISABLE);
-	}
+  }
 }
 
 extern "C" JNIEXPORT void JNICALL

universal7885-common/apps/SamsungParts/jni/Storage.cpp

@@ -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(
+Java_com_eurekateam_samsungextras_interfaces_Swap_getFreeSpace(JNIEnv *env,
-	JNIEnv *env, jclass clazz) {
+                                                               jclass clazz) {
-	fs::space_info data = fs::space("/data");
+  fs::space_info data = fs::space("/data");
-	auto freespace = data.free / 1024 / 1024;
+  auto freespace = data.free / 1024 / 1024;
-	return static_cast<double>(freespace) / 1024;
+  return static_cast<double>(freespace) / 1024;
 }
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_com_eurekateam_samsungextras_interfaces_Swap_getSwapSize(
+Java_com_eurekateam_samsungextras_interfaces_Swap_getSwapSize(JNIEnv *env,
-	JNIEnv *env, jclass clazz){
+                                                              jclass clazz) {
-	struct stat stat_buf;
+  struct stat stat_buf;
-	int rc = stat("/data/swap/swapfile", &stat_buf);
+  int rc = stat("/data/swap/swapfile", &stat_buf);
-	return rc == 0 ? stat_buf.st_size / 1024 / 1024 : -1;
+  return rc == 0 ? stat_buf.st_size / 1024 / 1024 : -1;
 }

universal7885-common/apps/SamsungParts/jni/SwapBridge.cpp

@@ -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,
+                                                          jclass clazz,
-                                                             jint size) {
+                                                          jint size) {
   service->setSwapSize(size);
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_eurekateam_samsungextras_interfaces_Swap_setSwapOn(
+Java_com_eurekateam_samsungextras_interfaces_Swap_setSwapOn(JNIEnv *env,
-    JNIEnv *env, jclass clazz, jboolean enable) {
+                                                            jclass clazz,
-	if (enable){
+                                                            jboolean enable) {
-		service->setSwapOn();
+  if (enable) {
-	} else {
+    service->setSwapOn();
-		service->setSwapOff();
+  } else {
-	}
+    service->setSwapOff();
+  }
 }

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

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
 }

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"

universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Swap.cpp

@@ -27,26 +27,24 @@ Return<void> SwapOnData::setSwapSize(int32_t size) {
   return Void();
 }
 
-Return<void> SwapOnData::setSwapOn(){
+Return<void> SwapOnData::setSwapOn() {
-	string cmd = string("dd if=/dev/zero of=") + string(SWAP_PATH) + string(" bs=") + std::to_string(mSwapSize) 
+  string cmd = string("dd if=/dev/zero of=") + string(SWAP_PATH) +
-		+ "M count=10";
+               string(" bs=") + std::to_string(mSwapSize) + "M count=10";
-	system(cmd.c_str());
+  system(cmd.c_str());
-	cmd = string("mkswap ") + string(SWAP_PATH);
+  cmd = string("mkswap ") + string(SWAP_PATH);
-	system(cmd.c_str());
+  system(cmd.c_str());
-	cmd = string("swapon -p 99 ") + string(SWAP_PATH);
+  cmd = string("swapon -p 99 ") + string(SWAP_PATH);
-	system(cmd.c_str());
+  system(cmd.c_str());
-	return Void();
+  return Void();
 }
 
-Return<void> SwapOnData::setSwapOff(){
+Return<void> SwapOnData::setSwapOff() {
-	std::string cmd = string("swapoff ") + string(SWAP_PATH);
+  std::string cmd = string("swapoff ") + string(SWAP_PATH);
-	system(cmd.c_str());
+  system(cmd.c_str());
-	cmd = string("rm ") + string(SWAP_PATH);
+  cmd = string("rm ") + string(SWAP_PATH);
-	system(cmd.c_str());
+  system(cmd.c_str());
-	return Void();
+  return Void();
 }
 
-ISwapOnData *SwapOnData::getInstance(void) {
+ISwapOnData *SwapOnData::getInstance(void) { return new SwapOnData(); }
-  return new SwapOnData();
-}
 } // namespace vendor::eureka::hardware::parts::V1_0

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;