Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 62335430: Merge change I4499ad72 into eclair

Browse Source 
Merge commit '62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-mr2

* commit '62335430b05d92ad2255bf20b76b35e012b385c9':
  Fix bad merge fixes build breakage.
This commit is contained in:
Eric Olsen
2009-11-04 17:36:59 -08:00
committed by Android Git Automerger
parent 05abe8d01d 62335430b0
commit e772eb7af0
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/HardwareService.java
View File

@@ -283,12 +283,6 @@ public class HardwareService extends IHardwareService.Stub {
setLight_native(mNativePointer, light, color, mode, onMS, offMS); 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) { public void setAttentionLight(boolean on, int color) {
// Not worthy of a permission. We shouldn't have a flashlight permission. // Not worthy of a permission. We shouldn't have a flashlight permission.
synchronized (this) { synchronized (this) {