summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--media/libstagefright/colorconversion/ColorConverter.cpp14
-rw-r--r--packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.pngbin497 -> 376 bytes
-rw-r--r--packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_e.pngbin561 -> 392 bytes
-rw-r--r--packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_e.pngbin554 -> 430 bytes
-rw-r--r--packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_e.pngbin652 -> 461 bytes
-rw-r--r--packages/SystemUI/res/values-it/strings.xml1
6 files changed, 14 insertions, 1 deletions
diff --git a/media/libstagefright/colorconversion/ColorConverter.cpp b/media/libstagefright/colorconversion/ColorConverter.cpp
index 0ef85e6..5bda1f6 100644
--- a/media/libstagefright/colorconversion/ColorConverter.cpp
+++ b/media/libstagefright/colorconversion/ColorConverter.cpp
@@ -136,9 +136,21 @@ status_t ColorConverter::convert(
case QOMX_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka:
{
void * lib = dlopen("libmm-color-convertor.so", RTLD_NOW);
+
+ if (!lib) {
+ LOGE("dlopen for libmm-color-convertor failed with errno %d", errno);
+ return ERROR_UNSUPPORTED;
+ }
+
+
typedef int (*convertFn)(ColorConvertParams src, ColorConvertParams dst, uint8_t *adjustedClip);
- convertFn convertNV12Tile = (convertFn)dlsym(lib, "_Z7convertN7android18ColorConvertParamsES0_Ph");
+ convertFn convertNV12Tile = (convertFn)dlsym(lib, "_ZN7android7convertENS_18ColorConvertParamsES0_Ph");
+ if (!convertNV12Tile) {
+ dlclose(lib);
+ LOGE("dlsym on libmm-color-convertor failed with errno %d", errno);
+ return ERROR_UNSUPPORTED;
+ }
struct ColorConvertParams srcTemp;
srcTemp.width = srcWidth;
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png
index a6d4672..3ccf3a0 100644
--- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_e.png
index 6cdc111..c08d207 100644
--- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_e.png
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_e.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_e.png
index b156b06..ac0d270 100644
--- a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_e.png
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_e.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_e.png
index 6f2619b..f18aa4f 100644
--- a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_e.png
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_e.png
Binary files differ
diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml
index b392d76..b328354 100644
--- a/packages/SystemUI/res/values-it/strings.xml
+++ b/packages/SystemUI/res/values-it/strings.xml
@@ -152,4 +152,5 @@
<string name="navbar_menu_conditional_button">Pulsante Menù (nascondi automaticamente)</string>
<string name="navbar_menu_always_button">Pulsante Menù (mostra sempre)</string>
<string name="navbar_menu_big_button">Pulsante Menù</string>
+ <string name="powerwidget_screen_timeout_toast">Timeout schermo impostato a: %1$d %2$s</string>
</resources>