am d6210cde: am e772eb7a: am 62335430: Merge change I4499ad72 into eclair

Merge commit 'd6210cdeb72bee9de12a9f69da9f2cd8011f37e0'

* commit 'd6210cdeb72bee9de12a9f69da9f2cd8011f37e0':
  Fix bad merge fixes build breakage.
This commit is contained in:
Eric Olsen
2009-11-04 17:56:52 -08:00
committed by Android Git Automerger

View File

@@ -283,12 +283,6 @@ public class HardwareService extends IHardwareService.Stub {
setLight_native(mNativePointer, light, color, mode, onMS, offMS);
}
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) {