Merge "Updating light service for hidl." (d920b9cd) · Commits · e / os / android_frameworks_base

services/core/Android.mk

+6 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,12 @@ LOCAL_SRC_FILES += \
		LOCAL_AIDL_INCLUDES += \
		system/netd/server/binder

		LOCAL_JAVA_LIBRARIES := services.net telephony-common \
		android.hardware.power@1.0-java
		LOCAL_JAVA_LIBRARIES := \
		services.net \
		telephony-common \
		android.hardware.power@1.0-java \
		android.hardware.light@2.0-java

		LOCAL_STATIC_JAVA_LIBRARIES := tzdata_update
		LOCAL_PROTOC_OPTIMIZE_TYPE := nano

services/core/java/com/android/server/lights/Light.java

+9 −6

Original line number	Diff line number	Diff line
		@@ -16,25 +16,28 @@

		package com.android.server.lights;

		import android.hardware.light.V2_0.Flash;
		import android.hardware.light.V2_0.Brightness;

		public abstract class Light {
		public static final int LIGHT_FLASH_NONE = 0;
		public static final int LIGHT_FLASH_TIMED = 1;
		public static final int LIGHT_FLASH_HARDWARE = 2;
		public static final int LIGHT_FLASH_NONE = Flash.NONE;
		public static final int LIGHT_FLASH_TIMED = Flash.TIMED;
		public static final int LIGHT_FLASH_HARDWARE = Flash.HARDWARE;

		/**
		* Light brightness is managed by a user setting.
		*/
		public static final int BRIGHTNESS_MODE_USER = 0;
		public static final int BRIGHTNESS_MODE_USER = Brightness.USER;

		/**
		* Light brightness is managed by a light sensor.
		*/
		public static final int BRIGHTNESS_MODE_SENSOR = 1;
		public static final int BRIGHTNESS_MODE_SENSOR = Brightness.SENSOR;

		/**
		* Low-persistence light mode.
		*/
		public static final int BRIGHTNESS_MODE_LOW_PERSISTENCE = 2;
		public static final int BRIGHTNESS_MODE_LOW_PERSISTENCE = Brightness.LOW_PERSISTENCE;

		public abstract void setBrightness(int brightness);
		public abstract void setBrightness(int brightness, int brightnessMode);

services/core/java/com/android/server/lights/LightsManager.java

+11 −9

Original line number	Diff line number	Diff line
		@@ -16,16 +16,18 @@

		package com.android.server.lights;

		import android.hardware.light.V2_0.Type;

		public abstract class LightsManager {
		public static final int LIGHT_ID_BACKLIGHT = 0;
		public static final int LIGHT_ID_KEYBOARD = 1;
		public static final int LIGHT_ID_BUTTONS = 2;
		public static final int LIGHT_ID_BATTERY = 3;
		public static final int LIGHT_ID_NOTIFICATIONS = 4;
		public static final int LIGHT_ID_ATTENTION = 5;
		public static final int LIGHT_ID_BLUETOOTH = 6;
		public static final int LIGHT_ID_WIFI = 7;
		public static final int LIGHT_ID_COUNT = 8;
		public static final int LIGHT_ID_BACKLIGHT = Type.BACKLIGHT;
		public static final int LIGHT_ID_KEYBOARD = Type.KEYBOARD;
		public static final int LIGHT_ID_BUTTONS = Type.BUTTONS;
		public static final int LIGHT_ID_BATTERY = Type.BATTERY;
		public static final int LIGHT_ID_NOTIFICATIONS = Type.NOTIFICATIONS;
		public static final int LIGHT_ID_ATTENTION = Type.ATTENTION;
		public static final int LIGHT_ID_BLUETOOTH = Type.BLUETOOTH;
		public static final int LIGHT_ID_WIFI = Type.WIFI;
		public static final int LIGHT_ID_COUNT = Type.COUNT;

		public abstract Light getLight(int id);
		}

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

+3 −16

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ public class LightsService extends SystemService {
		Trace.traceBegin(Trace.TRACE_TAG_POWER, "setLight(" + mId + ", 0x"
		+ Integer.toHexString(color) + ")");
		try {
		setLight_native(mNativePointer, mId, color, mode, onMS, offMS, brightnessMode);
		setLight_native(mId, color, mode, onMS, offMS, brightnessMode);
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_POWER);
		}
		@@ -155,8 +155,6 @@ public class LightsService extends SystemService {
		public LightsService(Context context) {
		super(context);

		mNativePointer = init_native();

		for (int i = 0; i < LightsManager.LIGHT_ID_COUNT; i++) {
		mLights[i] = new LightImpl(i);
		}
		@@ -217,7 +215,7 @@ public class LightsService extends SystemService {
		private final LightsManager mService = new LightsManager() {
		@Override
		public Light getLight(int id) {
		if (id < LIGHT_ID_COUNT) {
		if (0 <= id && id < LIGHT_ID_COUNT) {
		return mLights[id];
		} else {
		return null;
		@@ -225,12 +223,6 @@ public class LightsService extends SystemService {
		}
		};

		@Override
		protected void finalize() throws Throwable {
		finalize_native(mNativePointer);
		super.finalize();
		}

		private Handler mH = new Handler() {
		@Override
		public void handleMessage(Message msg) {
		@@ -239,11 +231,6 @@ public class LightsService extends SystemService {
		}
		};

		private static native long init_native();
		private static native void finalize_native(long ptr);

		static native void setLight_native(long ptr, int light, int color, int mode,
		static native void setLight_native(int light, int color, int mode,
		int onMS, int offMS, int brightnessMode);

		private long mNativePointer;
		}

services/core/jni/Android.mk

+2 −4

Original line number	Diff line number	Diff line
		@@ -68,7 +68,5 @@ LOCAL_SHARED_LIBRARIES += \
		libhwbinder \
		libutils \
		android.hardware.power@1.0 \

		LOCAL_SHARED_LIBRARIES += \
		libhidl libhwbinder android.hardware.vibrator@1.0

		android.hardware.vibrator@1.0 \
		android.hardware.light@2.0 \