summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2009-09-17 06:38:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-09-17 06:38:28 -0700
commitb9ad6dfd81fdc2a25b3e3b9647912e74ca0cf47c (patch)
treec528b50253a0b8f572ea7603bb186a5a0e0242c8
parent49c82ce55385b60a61236e79fc5c4185871a1d03 (diff)
parent2f4fc56183f3fe2edb5e3cd5e12329871e02518f (diff)
downloadbootable_recovery-b9ad6dfd81fdc2a25b3e3b9647912e74ca0cf47c.zip
bootable_recovery-b9ad6dfd81fdc2a25b3e3b9647912e74ca0cf47c.tar.gz
bootable_recovery-b9ad6dfd81fdc2a25b3e3b9647912e74ca0cf47c.tar.bz2
am 2f4fc561: am 196c25c7: don\'t complain if recovery icon is short
Merge commit '2f4fc56183f3fe2edb5e3cd5e12329871e02518f' * commit '2f4fc56183f3fe2edb5e3cd5e12329871e02518f': don't complain if recovery icon is short
-rw-r--r--ui.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ui.c b/ui.c
index 0a8b985..51df1fa 100644
--- a/ui.c
+++ b/ui.c
@@ -339,7 +339,11 @@ void ui_init(void)
for (i = 0; BITMAPS[i].name != NULL; ++i) {
int result = res_create_surface(BITMAPS[i].name, BITMAPS[i].surface);
if (result < 0) {
- LOGE("Missing bitmap %s\n(Code %d)\n", BITMAPS[i].name, result);
+ if (result == -2) {
+ LOGI("Bitmap %s missing header\n", BITMAPS[i].name);
+ } else {
+ LOGE("Missing bitmap %s\n(Code %d)\n", BITMAPS[i].name, result);
+ }
*BITMAPS[i].surface = NULL;
}
}