Revert "liblight: Add brightness level extension support"
This reverts commit 586c6d5f9af3177e4af73d3663e2cd7b3eadcf5a.
Change-Id: I7af568b0924b6d1bfce903f8d758f21d369c193c
diff --git a/liblight/lights.c b/liblight/lights.c
index 60ed911..f74fb54 100644
--- a/liblight/lights.c
+++ b/liblight/lights.c
@@ -33,7 +33,6 @@
#include <sys/types.h>
#include <hardware/lights.h>
-#include "lights_prv.h"
#ifndef DEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS
#define DEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS 0x80
@@ -47,7 +46,6 @@
static struct light_state_t g_battery;
static int g_last_backlight_mode = BRIGHTNESS_MODE_USER;
static int g_attention = 0;
-static int g_brightness_max = 0;
static bool g_has_persistence_node = false;
char const*const LCD_FILE
@@ -175,28 +173,6 @@
return cannot_handle_persistence ? -ENOSYS : err;
}
-static int
-set_light_backlight_ext(struct light_device_t* dev,
- struct light_state_t const* state)
-{
- int err = 0;
-
- if(!dev) {
- return -1;
- }
-
- int brightness = state->color & 0x00ffffff;
- pthread_mutex_lock(&g_lock);
-
- if (brightness >= 0 && brightness <= g_brightness_max) {
- set_brightness_ext_level(brightness);
- }
-
- pthread_mutex_unlock(&g_lock);
-
- return err;
-}
-
static int set_rgb_led_brightness(enum rgb_led led, int brightness)
{
char file[48];
@@ -383,19 +359,8 @@
struct light_state_t const* state);
if (0 == strcmp(LIGHT_ID_BACKLIGHT, name)) {
- char property[PROPERTY_VALUE_MAX];
- property_get("persist.extend.brightness", property, "0");
-
- if(!(strncmp(property, "1", PROPERTY_VALUE_MAX)) ||
- !(strncmp(property, "true", PROPERTY_VALUE_MAX))) {
- property_get("persist.display.max_brightness", property, "255");
- g_brightness_max = atoi(property);
- set_brightness_ext_init();
- set_light = set_light_backlight_ext;
- } else {
- g_has_persistence_node = !access(PERSISTENCE_FILE, F_OK);
- set_light = set_light_backlight;
- }
+ g_has_persistence_node = !access(PERSISTENCE_FILE, F_OK);
+ set_light = set_light_backlight;
} else if (0 == strcmp(LIGHT_ID_BATTERY, name))
set_light = set_light_battery;
else if (0 == strcmp(LIGHT_ID_NOTIFICATIONS, name))