commit 39720418d875b56d11000d86b02f397f3cf6ac20
author Leo Wang <leozwang@google.com> Thu Mar 24 00:35:56 2016 +0000
committer Leo Wang <leozwang@google.com> Thu Mar 24 00:53:39 2016 +0000
tree d8c3cefa3e3a6a8d60c57f0e4d6d8b0371b6fdac
parent bb90a00f12b3fc192544abb1fdd3bffede7e122a

Revert "Add some empty lights functions"

This reverts commit b523f437c66adbb87275fae2ab78d257188b5590.

Change-Id: I057a82740a0cd33186f298b8c22fc20e22d7160b

lights/Android.mk

diff --git a/lights/Android.mk b/lights/Android.mk
index 1c488d3..1aea964 100644
--- a/lights/Android.mk
+++ b/lights/Android.mk
@@ -18,7 +18,7 @@
 LOCAL_SRC_FILES := lights.c
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SHARED_LIBRARIES := liblog
-LOCAL_CFLAGS := $(common_flags) -Wno-unused-parameter -DLOG_TAG=\"lights\"
+LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"lights\"
 LOCAL_MODULE := lights.$(TARGET_BOARD_PLATFORM)
 LOCAL_MODULE_TAGS := optional
 

lights/lights.c

diff --git a/lights/lights.c b/lights/lights.c
index 098e641..9f5b2d2 100644
--- a/lights/lights.c
+++ b/lights/lights.c
@@ -67,29 +67,12 @@
     if(!dev) {
         return -1;
     }
-
     pthread_mutex_lock(&g_lock);
-    switch (state->flashMode) {
-        case LIGHT_FLASH_NONE:
-            err = write_int(LED1_LED_FILE, SET_LIGHT(state->color));
-            break;
-
-        /** Doesn't support flash. */
-        case LIGHT_FLASH_TIMED:
-        default:
-            err = -EINVAL;
-    }
+    err = write_int(LED1_LED_FILE, SET_LIGHT(state->color));
     pthread_mutex_unlock(&g_lock);
     return err;
 }
 
-/** Not available on Kylin. */
-static int set_light_unavailable(struct light_device_t* dev,
-        struct light_state_t const* state)
-{
-    return -EINVAL;
-}
-
 /** Close the lights device */
 static int close_lights(struct light_device_t *dev)
 {
@@ -115,14 +98,6 @@
 
     if (0 == strcmp(LIGHT_ID_NOTIFICATIONS, name))
         set_light = set_light_notifications;
-    else if (0 == strcmp(LIGHT_ID_ATTENTION, name))
-        set_light = set_light_notifications;
-    else if (0 == strcmp(LIGHT_ID_BUTTONS, name))
-        set_light = set_light_unavailable;
-    else if (0 == strcmp(LIGHT_ID_BLUETOOTH, name))
-        set_light = set_light_unavailable;
-    else if (0 == strcmp(LIGHT_ID_WIFI, name))
-        set_light = set_light_unavailable;
     else
         return -EINVAL;