Merge change I76127f6f into eclair
* changes:
Add support for colored LED on jogball backlight.
diff --git a/core/java/android/os/IHardwareService.aidl b/core/java/android/os/IHardwareService.aidl
index 594c0e8..34f30a7 100755
--- a/core/java/android/os/IHardwareService.aidl
+++ b/core/java/android/os/IHardwareService.aidl
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2007, The Android Open Source Project
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
* limitations under the License.
*/
@@ -23,13 +23,13 @@
void vibrate(long milliseconds, IBinder token);
void vibratePattern(in long[] pattern, int repeat, IBinder token);
void cancelVibrate(IBinder token);
-
+
// flashlight support
boolean getFlashlightEnabled();
void setFlashlightEnabled(boolean on);
void enableCameraFlash(int milliseconds);
// for the phone
- void setAttentionLight(boolean on);
+ void setAttentionLight(boolean on, int color);
}
diff --git a/services/java/com/android/server/HardwareService.java b/services/java/com/android/server/HardwareService.java
index b1d58ce..0446a9e 100755
--- a/services/java/com/android/server/HardwareService.java
+++ b/services/java/com/android/server/HardwareService.java
@@ -52,6 +52,7 @@
static final int LIGHT_FLASH_NONE = 0;
static final int LIGHT_FLASH_TIMED = 1;
+ static final int LIGHT_FLASH_HARDWARE = 2;
private final LinkedList<Vibration> mVibrations;
private Vibration mCurrentVibration;
@@ -125,7 +126,7 @@
mVibrations = new LinkedList<Vibration>();
mBatteryStats = BatteryStatsService.getService();
-
+
IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_SCREEN_OFF);
context.registerReceiver(mIntentReceiver, filter);
@@ -239,15 +240,15 @@
Binder.restoreCallingIdentity(identity);
}
}
-
+
public boolean getFlashlightEnabled() {
return Hardware.getFlashlightEnabled();
}
-
+
public void setFlashlightEnabled(boolean on) {
- if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.FLASHLIGHT)
+ if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.FLASHLIGHT)
!= PackageManager.PERMISSION_GRANTED &&
- mContext.checkCallingOrSelfPermission(android.Manifest.permission.HARDWARE_TEST)
+ mContext.checkCallingOrSelfPermission(android.Manifest.permission.HARDWARE_TEST)
!= PackageManager.PERMISSION_GRANTED) {
throw new SecurityException("Requires FLASHLIGHT or HARDWARE_TEST permission");
}
@@ -255,9 +256,9 @@
}
public void enableCameraFlash(int milliseconds) {
- if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.CAMERA)
+ if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.CAMERA)
!= PackageManager.PERMISSION_GRANTED &&
- mContext.checkCallingOrSelfPermission(android.Manifest.permission.HARDWARE_TEST)
+ mContext.checkCallingOrSelfPermission(android.Manifest.permission.HARDWARE_TEST)
!= PackageManager.PERMISSION_GRANTED) {
throw new SecurityException("Requires CAMERA or HARDWARE_TEST permission");
}
@@ -282,13 +283,19 @@
setLight_native(mNativePointer, light, color, mode, onMS, offMS);
}
- public void setAttentionLight(boolean on) {
+ void setAutoBrightness_UNCHECKED(boolean on) {
+ if (mAutoBrightnessAvailable) {
+ setAutoBrightness_native(mNativePointer, on);
+ }
+ }
+
+ public void setAttentionLight(boolean on, int color) {
// Not worthy of a permission. We shouldn't have a flashlight permission.
synchronized (this) {
mAttentionLightOn = on;
mPulsing = false;
- setLight_native(mNativePointer, LIGHT_ID_ATTENTION, on ? 0xffffffff : 0,
- LIGHT_FLASH_NONE, 0, 0);
+ setLight_native(mNativePointer, LIGHT_ID_ATTENTION, color,
+ LIGHT_FLASH_HARDWARE, on ? 3 : 0, 0);
}
}
@@ -302,8 +309,8 @@
}
if (!mAttentionLightOn && !mPulsing) {
mPulsing = true;
- setLight_native(mNativePointer, LIGHT_ID_ATTENTION, 0xff101010,
- LIGHT_FLASH_NONE, 0, 0);
+ setLight_native(mNativePointer, LIGHT_ID_ATTENTION, 0x00ffffff,
+ LIGHT_FLASH_HARDWARE, 7, 0);
mH.sendMessageDelayed(Message.obtain(mH, 1), 3000);
}
}
@@ -391,7 +398,7 @@
private class VibrateThread extends Thread {
final Vibration mVibration;
boolean mDone;
-
+
VibrateThread(Vibration vib) {
mVibration = vib;
mWakeLock.acquire();
@@ -425,7 +432,7 @@
long duration = 0;
while (!mDone) {
- // add off-time duration to any accumulated on-time duration
+ // add off-time duration to any accumulated on-time duration
if (index < len) {
duration += pattern[index++];
}
@@ -478,7 +485,7 @@
}
}
};
-
+
private static native int init_native();
private static native void finalize_native(int ptr);
@@ -489,7 +496,7 @@
private final PowerManager.WakeLock mWakeLock;
private final IBatteryStats mBatteryStats;
-
+
volatile VibrateThread mThread;
private int mNativePointer;