From 006243af7c6c8b57c9567949b680ddb8ed478765 Mon Sep 17 00:00:00 2001
From: roynatech2544 <whiteshell2544@naver.com>
Date: Tue, 12 Apr 2022 18:19:01 +0900
Subject: [PATCH] universal7885: parts: Don't code every possible values

* Use static_cast<Enum class>(Value) instead
---
 .../SamsungParts/jni/FlashlightBridge.cpp     | 35 +-----------------
 .../hardware/parts/1.0/default/FlashLight.cpp | 37 +------------------
 .../interfaces/hardware/parts/1.0/types.hal   |  4 +-
 3 files changed, 4 insertions(+), 72 deletions(-)

diff --git a/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp b/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp
index 0db4dd7..0fb184b 100644
--- a/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp
+++ b/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp
@@ -17,40 +17,7 @@ extern "C" JNIEXPORT void JNICALL
 Java_com_eurekateam_samsungextras_interfaces_Flashlight_setFlash(
     JNIEnv *env, __unused jobject obj, jint value) {
   service->setFlashlightEnable(Number::ENABLE);
-  switch (value) {
-  case 1:
-    service->setFlashlightWritable(Value::ONEUI);
-    break;
-  case 2:
-    service->setFlashlightWritable(Value::TWOUI);
-    break;
-  case 3:
-    service->setFlashlightWritable(Value::THREEUI);
-    break;
-  case 4:
-    service->setFlashlightWritable(Value::FOURUI);
-    break;
-  case 5:
-    service->setFlashlightWritable(Value::FIVEUI);
-    break;
-  case 6:
-    service->setFlashlightWritable(Value::SIXUI);
-    break;
-  case 7:
-    service->setFlashlightWritable(Value::SEVENUI);
-    break;
-  case 8:
-    service->setFlashlightWritable(Value::EIGHTUI);
-    break;
-  case 9:
-    service->setFlashlightWritable(Value::NINEUI);
-    break;
-  case 10:
-    service->setFlashlightWritable(Value::TENUI);
-    break;
-  default:
-    break;
-  }
+  service->setFlashlightWritable(static_cast<Value>(value));
 }
 extern "C" JNIEXPORT jint JNICALL
 Java_com_eurekateam_samsungextras_interfaces_Flashlight_getFlash(JNIEnv *env,
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/FlashLight.cpp b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/FlashLight.cpp
index 61f7db4..945cfb9 100644
--- a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/FlashLight.cpp
+++ b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/FlashLight.cpp
@@ -41,42 +41,7 @@ Return<void> FlashBrightness::setFlashlightEnable(parts::V1_0::Number enable) {
 
 Return<void> FlashBrightness::setFlashlightWritable(parts::V1_0::Value value) {
   std::ofstream file;
-  std::string writevalue;
-  switch (value) {
-  case Value::ONEUI:
-    writevalue = "1";
-    break;
-  case Value::TWOUI:
-    writevalue = "2";
-    break;
-  case Value::THREEUI:
-    writevalue = "3";
-    break;
-  case Value::FOURUI:
-    writevalue = "4";
-    break;
-  case Value::FIVEUI:
-    writevalue = "5";
-    break;
-  case Value::SIXUI:
-    writevalue = "6";
-    break;
-  case Value::SEVENUI:
-    writevalue = "7";
-    break;
-  case Value::EIGHTUI:
-    writevalue = "8";
-    break;
-  case Value::NINEUI:
-    writevalue = "9";
-    break;
-  case Value::TENUI:
-    writevalue = "10";
-    break;
-  default:
-    writevalue = "";
-    break;
-  }
+  std::string writevalue = std::to_string((int) value);
   file.open("/sys/class/camera/flash/torch_brightness_lvl");
   file << writevalue;
   file.close();
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/types.hal b/universal7885-common/hardware/interfaces/hardware/parts/1.0/types.hal
index 90066f6..80ac697 100644
--- a/universal7885-common/hardware/interfaces/hardware/parts/1.0/types.hal
+++ b/universal7885-common/hardware/interfaces/hardware/parts/1.0/types.hal
@@ -39,7 +39,7 @@ enum Device : int32_t {
 };
 
 enum Value : int32_t {
-	ONEUI,
+	ONEUI = 1,
 	TWOUI,
 	THREEUI,
 	FOURUI,
@@ -48,5 +48,5 @@ enum Value : int32_t {
 	SEVENUI,
 	EIGHTUI,
 	NINEUI,
-	TENUI,
+	TENUI = 10,
 };