Merge change Id7b9903e into eclair-mr2

* changes:
  Add setAttentionLight() to IPowerManager for the Phone app.

2 files changed, 6 insertions, 0 deletions

diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl
index 70a634ffdb01..0afc537cb1b9 100644
--- a/core/java/android/os/IPowerManager.aidl
+++ b/core/java/android/os/IPowerManager.aidl
@@ -34,4 +34,5 @@ interface IPowerManager
 
     // sets the brightness of the backlights (screen, keyboard, button) 0-255
     void setBacklightBrightness(int brightness);
+    void setAttentionLight(boolean on, int color);
 }
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index b1ecb3c22512..ca7d94a683ea 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -2476,6 +2476,11 @@ class PowerManagerService extends IPowerManager.Stub
         }
     }
 
+    public void setAttentionLight(boolean on, int color) {
+        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);
+        mLightsService.setAttentionLight(on, color);
+    }
+
     private void enableProximityLockLocked() {
         if (mDebugProximitySensor) {
             Log.d(TAG, "enableProximityLockLocked");