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

Commit 648ab3ac authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "lights: Support deprecated flashlight API on MSM" into froyo

parents adeeb14b 6a0b0ec4

services/java/com/android/server/LightsService.java

+11 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.os.IHardwareService; 
import android.os.ServiceManager;

import android.os.Message;

import android.util.Slog;

import android.util.Log;



import java.io.File;

import java.io.FileInputStream;
@@ -62,6 +61,17 @@ public class LightsService { 


    private final Light mLights[] = new Light[LIGHT_ID_COUNT];



    private static final String FLASHLIGHT_FILE;

    private static final String FLASHLIGHT_FILE_SPOTLIGHT = "/sys/class/leds/spotlight/brightness";

    static {

        File ff = new File(FLASHLIGHT_FILE_SPOTLIGHT);

        if (ff.exists()) {

            FLASHLIGHT_FILE = FLASHLIGHT_FILE_SPOTLIGHT;

        } else {

            FLASHLIGHT_FILE = "/sys/class/leds/flashlight/brightness";

        }

    }



    public final class Light {



        private Light(int id) {
@@ -149,8 +159,6 @@ public class LightsService { 
     */

    private final IHardwareService.Stub mLegacyFlashlightHack = new IHardwareService.Stub() {



        private static final String FLASHLIGHT_FILE = "/sys/class/leds/spotlight/brightness";



        public boolean getFlashlightEnabled() {

            try {

                FileInputStream fis = new FileInputStream(FLASHLIGHT_FILE);