Merge commit 'e772eb7af049b55c89241fae799569030c1f5570' into eclair-mr2-plus-aosp * commit 'e772eb7af049b55c89241fae799569030c1f5570': Fix bad merge fixes build breakage.
This commit is contained in:
@@ -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) {
|
||||||
|
|||||||
Reference in New Issue
Block a user