Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52443eb3 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'eclair' of git://github.com/ChainsDD/android_frameworks_base into eclair

parents 4c9b2b80 fd73e543

services/java/com/android/server/HardwareService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -305,10 +305,10 @@ public class HardwareService extends IHardwareService.Stub { 




    // Overload this function to prevent possibly breaking anything.

    // Overload this function to prevent possibly breaking anything.

    public void pulseBreathingLight() {

    public void pulseBreathingLight() {

        pulseBreathingLight(0x00ffffff);

        pulseBreathingLightColor(0x00ffffff);

    }

    }





    public void pulseBreathingLight(int color) {

    public void pulseBreathingLightColor(int color) {

        synchronized (this) {

        synchronized (this) {

            // HACK: Added at the last minute of cupcake -- design this better;

            // HACK: Added at the last minute of cupcake -- design this better;

            // Don't reuse the attention light -- make another one.

            // Don't reuse the attention light -- make another one.

services/java/com/android/server/NotificationManagerService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1044,7 +1044,7 @@ class NotificationManagerService extends INotificationManager.Stub 
        // we only flash if screen is off and persistent pulsing is enabled

        // we only flash if screen is off and persistent pulsing is enabled

        if (mLedNotification == null || (mScreenOn && !mNotificationScreenOn) || !mNotificationPulseEnabled) {

        if (mLedNotification == null || (mScreenOn && !mNotificationScreenOn) || !mNotificationPulseEnabled) {

            if (mPulseBreathingLight) {

            if (mPulseBreathingLight) {

                mHardware.pulseBreathingLight(mBreathingLightColor);

                mHardware.pulseBreathingLightColor(mBreathingLightColor);

            } else {

            } else {

                mHardware.setLightOff_UNCHECKED(HardwareService.LIGHT_ID_NOTIFICATIONS);

                mHardware.setLightOff_UNCHECKED(HardwareService.LIGHT_ID_NOTIFICATIONS);

            }

            }