Merge branch 'eclair' of git://github.com/ChainsDD/android_frameworks_base into eclair (3b5ff195) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -315,7 +315,7 @@ public class HardwareService extends IHardwareService.Stub {
		mPulsing = true;
		setLight_native(mNativePointer, LIGHT_ID_ATTENTION, 0x00ffffff,
		LIGHT_FLASH_HARDWARE, 7, 0, 0);
		mH.sendMessageDelayed(Message.obtain(mH, 1), 3000);
		mH.sendMessageDelayed(Message.obtain(mH, 1), 2000);
		}
		}
		}

+9 −2

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ class NotificationManagerService extends INotificationManager.Stub
		private boolean mScreenOn = true;
		private boolean mNotificationScreenOn;
		private boolean mNotificationPulseEnabled;
		private boolean mPulseBreathingLight;

		// for adb connected notifications
		private boolean mUsbConnected;
		@@ -709,7 +710,8 @@ class NotificationManagerService extends INotificationManager.Stub
		long identity = Binder.clearCallingIdentity();
		try {
		r.statusBarKey = mStatusBarService.addIcon(icon, n);
		mHardware.pulseBreathingLight();
		// Only pulse breathing light if we're not going to flash the notification LED
		mPulseBreathingLight = true;
		}
		finally {
		Binder.restoreCallingIdentity(identity);
		@@ -1036,7 +1038,12 @@ class NotificationManagerService extends INotificationManager.Stub

		// we only flash if screen is off and persistent pulsing is enabled
		if (mLedNotification == null \|\| (mScreenOn && !mNotificationScreenOn) \|\| !mNotificationPulseEnabled) {
		if (mPulseBreathingLight) {
		mHardware.pulseBreathingLight();
		mPulseBreathingLight = false;
		} else {
		mHardware.setLightOff_UNCHECKED(HardwareService.LIGHT_ID_NOTIFICATIONS);
		}
		} else {
		mHardware.setLightFlashing_UNCHECKED(
		HardwareService.LIGHT_ID_NOTIFICATIONS,