diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java
old mode 100644
new mode 100755
index d0f6eee10e355..696ef317b1e91
--- a/services/java/com/android/server/NotificationManagerService.java
+++ b/services/java/com/android/server/NotificationManagerService.java
@@ -957,8 +957,15 @@ class NotificationManagerService extends INotificationManager.Stub
     {
         // Battery low always shows, other states only show if charging.
         if (mBatteryLow) {
-            mHardware.setLightFlashing_UNCHECKED(HardwareService.LIGHT_ID_BATTERY, BATTERY_LOW_ARGB,
-                    HardwareService.LIGHT_FLASH_TIMED, BATTERY_BLINK_ON, BATTERY_BLINK_OFF);
+            if (mBatteryCharging) {
+                mHardware.setLightColor_UNCHECKED(HardwareService.LIGHT_ID_BATTERY,
+                    BATTERY_LOW_ARGB);
+            } else {
+                // Flash when battery is low and not charging
+                mHardware.setLightFlashing_UNCHECKED(HardwareService.LIGHT_ID_BATTERY,
+                    BATTERY_LOW_ARGB, HardwareService.LIGHT_FLASH_TIMED,
+                    BATTERY_BLINK_ON, BATTERY_BLINK_OFF);
+            }
         } else if (mBatteryCharging) {
             if (mBatteryFull) {
                 mHardware.setLightColor_UNCHECKED(HardwareService.LIGHT_ID_BATTERY,