Merge "copybit: Fix type conversion error for GCC 4.7"
diff --git a/libhwcomposer/hwc_utils.cpp b/libhwcomposer/hwc_utils.cpp
index d6d9759..1bb683a 100644
--- a/libhwcomposer/hwc_utils.cpp
+++ b/libhwcomposer/hwc_utils.cpp
@@ -387,10 +387,7 @@
ctx->listStats[dpy].extOnlyLayerIndex = -1;
ctx->listStats[dpy].isDisplayAnimating = false;
- //reset yuv indices
- memset(ctx->listStats[dpy].yuvIndices, -1, MAX_NUM_APP_LAYERS);
-
- for (size_t i = 0; i < (list->numHwLayers - 1); i++) {
+ for (size_t i = 0; i < (size_t)ctx->listStats[dpy].numAppLayers; i++) {
hwc_layer_1_t const* layer = &list->hwLayers[i];
private_handle_t *hnd = (private_handle_t *)layer->handle;
@@ -399,14 +396,14 @@
ctx->listStats[dpy].isDisplayAnimating = true;
}
#endif
- // continue if i reaches MAX_NUM_APP_LAYERS
- if(i >= MAX_NUM_APP_LAYERS)
+ // continue if number of app layers exceeds MAX_NUM_APP_LAYERS
+ if(ctx->listStats[dpy].numAppLayers > MAX_NUM_APP_LAYERS)
continue;
- if(list->hwLayers[i].compositionType == HWC_FRAMEBUFFER_TARGET) {
- continue;
- //We disregard FB being skip for now! so the else if
- } else if (isSkipLayer(&list->hwLayers[i])) {
+ //reset yuv indices
+ ctx->listStats[dpy].yuvIndices[i] = -1;
+
+ if (isSkipLayer(&list->hwLayers[i])) {
ctx->listStats[dpy].skipCount++;
}
diff --git a/liblight/lights.c b/liblight/lights.c
index 2c62744..14a6646 100644
--- a/liblight/lights.c
+++ b/liblight/lights.c
@@ -51,17 +51,8 @@
char const*const LCD_FILE
= "/sys/class/leds/lcd-backlight/brightness";
-char const*const RED_FREQ_FILE
- = "/sys/class/leds/red/device/grpfreq";
-
-char const*const RED_PWM_FILE
- = "/sys/class/leds/red/device/grppwm";
-
char const*const RED_BLINK_FILE
- = "/sys/class/leds/red/device/blink";
-
-char const*const LED_LOCK_UPDATE_FILE
- = "/sys/class/leds/red/device/lock";
+ = "/sys/class/leds/red/blink";
/**
* device methods
@@ -127,7 +118,7 @@
{
int len;
int alpha, red, green, blue;
- int blink, freq, pwm;
+ int blink;
int onMS, offMS;
unsigned int colorRGB;
@@ -155,40 +146,18 @@
blue = colorRGB & 0xFF;
if (onMS > 0 && offMS > 0) {
- int totalMS = onMS + offMS;
-
- // the LED appears to blink about once per second if freq is 20
- // 1000ms / 20 = 50
- freq = totalMS / 50;
- // pwm specifies the ratio of ON versus OFF
- // pwm = 0 -> always off
- // pwm = 255 => always on
- pwm = (onMS * 255) / totalMS;
-
- // the low 4 bits are ignored, so round up if necessary
- if (pwm > 0 && pwm < 16)
- pwm = 16;
-
blink = 1;
} else {
blink = 0;
- freq = 0;
- pwm = 0;
}
- write_int(LED_LOCK_UPDATE_FILE, 1); // for LED On/Off synchronization
-
- write_int(RED_LED_FILE, red);
- write_int(GREEN_LED_FILE, green);
- write_int(BLUE_LED_FILE, blue);
-
if (blink) {
- write_int(RED_FREQ_FILE, freq);
- write_int(RED_PWM_FILE, pwm);
+ write_int(RED_BLINK_FILE, blink);
+ } else {
+ write_int(RED_LED_FILE, red);
+ write_int(GREEN_LED_FILE, green);
+ write_int(BLUE_LED_FILE, blue);
}
- write_int(RED_BLINK_FILE, blink);
-
- write_int(LED_LOCK_UPDATE_FILE, 0);
return 0;
}