commit a26ee499a7d20c4ae86851aff1d9792c5855c5b4
author The Android Automerger <android-build@android.com> Fri Oct 12 16:33:07 2012 -0700
committer The Android Automerger <android-build@android.com> Fri Oct 12 16:33:07 2012 -0700
tree a41e1a399d60b126b60c5b60974139a092656e5a
parent 209c7b0fad9604d1dde1b74d9f9d577b923469fd
parent f3f1d016759019ec62f5873ddbae0b523199475b

merge in jb-mr1-release history after reset to jb-mr1-dev

charger/Android.mk

diff --git a/charger/Android.mk b/charger/Android.mk
index de9b184..fe0c91d 100644
--- a/charger/Android.mk
+++ b/charger/Android.mk
@@ -8,6 +8,10 @@
 LOCAL_SRC_FILES := \
 	charger.c
 
+ifeq ($(strip $(BOARD_CHARGER_DISABLE_INIT_BLANK)),true)
+LOCAL_CFLAGS := -DCHARGER_DISABLE_INIT_BLANK
+endif
+
 LOCAL_MODULE := charger
 LOCAL_MODULE_TAGS := optional
 LOCAL_FORCE_STATIC_EXECUTABLE := true

charger/charger.c

diff --git a/charger/charger.c b/charger/charger.c
index 76be076..c5e4ec2 100644
--- a/charger/charger.c
+++ b/charger/charger.c
@@ -975,7 +975,9 @@
 
     ev_sync_key_state(set_key_callback, charger);
 
+#ifndef CHARGER_DISABLE_INIT_BLANK
     gr_fb_blank(true);
+#endif
 
     charger->next_screen_transition = now - 1;
     charger->next_key_check = -1;