diff --git a/universal7885-common/SamsungParts/jni/BatteryBridge.cpp b/universal7885-common/SamsungParts/jni/BatteryBridge.cpp
index 77b0d90..24bd088 100644
--- a/universal7885-common/SamsungParts/jni/BatteryBridge.cpp
+++ b/universal7885-common/SamsungParts/jni/BatteryBridge.cpp
@@ -69,25 +69,32 @@ Java_com_eurekateam_samsungextras_interfaces_Battery_getGeneralBatteryStats(JNIE
       switch (id) {
           case 1:
                 ret = service->getBatteryStats(SysfsType::CAPACITY_MAX) / 1000;
+                break;
           case 2:
                 ret = service->getBatteryStats(SysfsType::CAPACITY_CURRENT);
+                break;
           case 3:
                 ret = (float) service->getBatteryStats(SysfsType::CAPACITY_CURRENT) *
                         (float) service->getBatteryStats(SysfsType::CAPACITY_MAX) / 100000;
+                break;
           case 4:
                 if (service->getBatteryStats(SysfsType::CURRENT) > 0){
                       ret = 1;
                 }else{
                       ret = 0;
                 }
+                break;
           case 5:
                 ret = service->getBatteryStats(SysfsType::TEMP) / 10;
+                break;
           case 6:
                 ret = service->getBatteryStats(SysfsType::CURRENT);
+                break;
           default:
                 ret = -1;
+                break;
       }
       return ret;
 
 
-}
\ No newline at end of file
+}
diff --git a/universal7885-common/SamsungParts/jni/FlashlightBridge.cpp b/universal7885-common/SamsungParts/jni/FlashlightBridge.cpp
index 49c1ad3..d298db8 100644
--- a/universal7885-common/SamsungParts/jni/FlashlightBridge.cpp
+++ b/universal7885-common/SamsungParts/jni/FlashlightBridge.cpp
@@ -5,10 +5,10 @@
 #include <hidl/HidlSupport.h>
 #include "jni.h"
 
-using vendor::eureka::hardware::battery::V1_0::IFlashlight;
-using vendor::eureka::hardware::battery::V1_0::Device;
-using vendor::eureka::hardware::battery::V1_0::Enable;
-using vendor::eureka::hardware::battery::V1_0::Number;
+using vendor::eureka::hardware::flashlight::V1_0::IFlashlight;
+using vendor::eureka::hardware::flashlight::V1_0::Device;
+using vendor::eureka::hardware::flashlight::V1_0::Enable;
+using vendor::eureka::hardware::flashlight::V1_0::Number;
 using android::sp;
 
 extern "C"
@@ -20,24 +20,36 @@ Java_com_eurekateam_samsungextras_interfaces_Flashlight_setFlash(JNIEnv *env, __
       switch (value) {
           case 1:
                 service->setFlashlightWritable(Number::ONEUI);
+                break;
           case 2:
                 service->setFlashlightWritable(Number::TWOUI);
+                break;
           case 3:
                 service->setFlashlightWritable(Number::THREEUI);
+                break;
           case 4:
                 service->setFlashlightWritable(Number::FOURUI);
+                break;
           case 5:
                 service->setFlashlightWritable(Number::FIVEUI);
+                break;
           case 6:
                 service->setFlashlightWritable(Number::SIXUI);
+                break;
           case 7:
                 service->setFlashlightWritable(Number::SEVENUI);
+                break;
           case 8:
                 service->setFlashlightWritable(Number::EIGHTUI);
+                break;
           case 9:
                 service->setFlashlightWritable(Number::NINEUI);
+                break;
           case 10:
                 service->setFlashlightWritable(Number::TENUI);
+                break;
+          default:
+          	break;
 
       }
 }
@@ -53,4 +65,4 @@ Java_com_eurekateam_samsungextras_interfaces_Flashlight_getFlash(JNIEnv *env, jc
             ret = service->readFlashlightstats(Device::NOTA10);
       }
       return ret;
-}
\ No newline at end of file
+}
diff --git a/universal7885-common/SamsungParts/jni/GPUBridge.cpp b/universal7885-common/SamsungParts/jni/GPUBridge.cpp
index 46dbbc6..e07a777 100644
--- a/universal7885-common/SamsungParts/jni/GPUBridge.cpp
+++ b/universal7885-common/SamsungParts/jni/GPUBridge.cpp
@@ -9,18 +9,6 @@ using vendor::eureka::hardware::gpu::V1_0::IGpu;
 using vendor::eureka::hardware::gpu::V1_0::Enable;
 using android::sp;
  
-extern "C" JNIEXPORT void
-JNICALL
-Java_com_eurekateam_samsungextras_interfaces_Battery_setChargeSysfs
-(JNIEnv *env , __unused jclass obj, jint enable) {
-      android::sp<IBattery> service = IBattery::getService();
-      if (enable == 1){
-      service->setBatteryWritable(SysfsType::CHARGE, Number::ENABLE);
-      }else{
-      service->setBatteryWritable(SysfsType::CHARGE, Number::DISABLE);
-      }
-}
-
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_eurekateam_samsungextras_interfaces_GPU_setGPU(JNIEnv *env, jclass clazz, jint enable) {
@@ -37,4 +25,4 @@ Java_com_eurekateam_samsungextras_interfaces_GPU_getGPU(JNIEnv *env, jclass claz
       android::sp<IGpu> service = IGpu::getService();
       int ret = service->readGpustats();
       return ret;
-}
\ No newline at end of file
+}
diff --git a/universal7885-common/manifest.xml b/universal7885-common/manifest.xml
index 1a972bb..6c79967 100644
--- a/universal7885-common/manifest.xml
+++ b/universal7885-common/manifest.xml
@@ -146,6 +146,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.sensors</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ISensors</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>