Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e772eb7a authored by Eric Olsen's avatar Eric Olsen Committed by Android Git Automerger
Browse files

am 62335430: Merge change I4499ad72 into eclair 

Merge commit '62335430' into eclair-mr2

* commit '62335430':
  Fix bad merge fixes build breakage.
parents 05abe8d0 62335430

services/java/com/android/server/HardwareService.java

+0 −6
Original line number Diff line number Diff line
@@ -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) {