samsung: hidl: light: battery has lowest priority

Change-Id: I90d61439f8a431f1836e439d34764b7eb7983db9

diff --git a/hidl/light/Light.cpp b/hidl/light/Light.cpp
index cc5e5d4c20aab2ca307c5ff5634869f862021a51..3e9b17f82fb91295e5132bde99c48205d5061e62 100644 (file)
--- a/hidl/light/Light.cpp
+++ b/hidl/light/Light.cpp
@@ -125,10 +125,7 @@ void Light::setNotificationLED() {
     bool bln = false;
 #endif
 
-    if (mBatteryState.color & COLOR_MASK) {
-        adjusted_brightness = LED_BRIGHTNESS_BATTERY;
-        state = mBatteryState;
-    } else if (mNotificationState.color & COLOR_MASK) {
+    if (mNotificationState.color & COLOR_MASK) {
         adjusted_brightness = LED_BRIGHTNESS_NOTIFICATION;
         state = mNotificationState;
 #ifdef LED_BLN_NODE
@@ -144,6 +141,9 @@ void Light::setNotificationLED() {
         if (state.flashMode == Flash::NONE) {
             state.color = 0;
         }
+    } else if (mBatteryState.color & COLOR_MASK) {
+        adjusted_brightness = LED_BRIGHTNESS_BATTERY;
+        state = mBatteryState;
     } else {
         set(LED_BLINK_NODE, "0x00000000 0 0");
         return;