Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_bootable_recovery into gingerbread

2011-07-29 01:30:08 +01:00 · 2011-07-29 01:30:08 +01:00 · 5ee0380c67
commit 5ee0380c67
parent 7b2697f66f 04a211f372
41 changed files with 19 additions and 4 deletions
--- a/etc/init.htc.rc
+++ b/etc/init.htc.rc
@ -31,18 +31,25 @@ service ueventd /sbin/ueventd
    critical

 service choice_fn /sbin/choice_fn
-    oneshot
+oneshot

 service recovery /sbin/recovery
-    disabled
+disabled

 service power_test /sbin/power_test
-    disabled
-    oneshot
+disabled
+oneshot

 service offmode_charging /sbin/offmode_charging
+disabled
+oneshot

 service detect_key /sbin/detect_key
+disabled
+oneshot
+
+service htcbatt /sbin/htcbatt
+oneshot

 service adbd /sbin/adbd recovery
    disabled
--- a/htc/res/offmode_charging_images/battery_error.png
+++ b/htc/res/offmode_charging_images/battery_error.png
--- a/htc/res/offmode_charging_images/battery_left_0.png
+++ b/htc/res/offmode_charging_images/battery_left_0.png
--- a/htc/res/offmode_charging_images/battery_left_100.png
+++ b/htc/res/offmode_charging_images/battery_left_100.png
--- a/htc/res/offmode_charging_images/battery_left_20.png
+++ b/htc/res/offmode_charging_images/battery_left_20.png
--- a/htc/res/offmode_charging_images/battery_left_40.png
+++ b/htc/res/offmode_charging_images/battery_left_40.png
--- a/htc/res/offmode_charging_images/battery_left_60.png
+++ b/htc/res/offmode_charging_images/battery_left_60.png
--- a/htc/res/offmode_charging_images/battery_left_80.png
+++ b/htc/res/offmode_charging_images/battery_left_80.png
--- a/htc/res/offmode_charging_images/battery_right_0.png
+++ b/htc/res/offmode_charging_images/battery_right_0.png
--- a/htc/res/offmode_charging_images/battery_right_100.png
+++ b/htc/res/offmode_charging_images/battery_right_100.png
--- a/htc/res/offmode_charging_images/battery_right_20.png
+++ b/htc/res/offmode_charging_images/battery_right_20.png
--- a/htc/res/offmode_charging_images/battery_right_40.png
+++ b/htc/res/offmode_charging_images/battery_right_40.png
--- a/htc/res/offmode_charging_images/battery_right_60.png
+++ b/htc/res/offmode_charging_images/battery_right_60.png
--- a/htc/res/offmode_charging_images/battery_right_80.png
+++ b/htc/res/offmode_charging_images/battery_right_80.png
--- a/htc/res/offmode_charging_images/battery_shell.png
+++ b/htc/res/offmode_charging_images/battery_shell.png
--- a/htc/res/offmode_charging_images/charging_full_00031.png
+++ b/htc/res/offmode_charging_images/charging_full_00031.png
--- a/htc/res/offmode_charging_images/charging_full_00035.png
+++ b/htc/res/offmode_charging_images/charging_full_00035.png
--- a/htc/res/offmode_charging_images/charging_full_00041.png
+++ b/htc/res/offmode_charging_images/charging_full_00041.png
--- a/htc/res/offmode_charging_images/charging_full_00043.png
+++ b/htc/res/offmode_charging_images/charging_full_00043.png
--- a/htc/res/offmode_charging_images/charging_full_00047.png
+++ b/htc/res/offmode_charging_images/charging_full_00047.png
--- a/htc/res/offmode_charging_images/charging_full_00049.png
+++ b/htc/res/offmode_charging_images/charging_full_00049.png
--- a/htc/res/offmode_charging_images/charging_full_00053.png
+++ b/htc/res/offmode_charging_images/charging_full_00053.png
--- a/htc/res/offmode_charging_images/charging_full_00055.png
+++ b/htc/res/offmode_charging_images/charging_full_00055.png
--- a/htc/res/offmode_charging_images/charging_full_00059.png
+++ b/htc/res/offmode_charging_images/charging_full_00059.png
--- a/htc/res/offmode_charging_images/charging_full_00061.png
+++ b/htc/res/offmode_charging_images/charging_full_00061.png
--- a/htc/res/offmode_charging_images/charging_full_00065.png
+++ b/htc/res/offmode_charging_images/charging_full_00065.png
--- a/htc/res/offmode_charging_images/charging_full_00067.png
+++ b/htc/res/offmode_charging_images/charging_full_00067.png
--- a/htc/res/offmode_charging_images/charging_full_00071.png
+++ b/htc/res/offmode_charging_images/charging_full_00071.png
--- a/htc/res/offmode_charging_images/charging_full_00073.png
+++ b/htc/res/offmode_charging_images/charging_full_00073.png
--- a/htc/res/offmode_charging_images/charging_full_00077.png
+++ b/htc/res/offmode_charging_images/charging_full_00077.png
--- a/htc/res/offmode_charging_images/charging_full_00079.png
+++ b/htc/res/offmode_charging_images/charging_full_00079.png
--- a/htc/res/offmode_charging_images/charging_full_00083.png
+++ b/htc/res/offmode_charging_images/charging_full_00083.png
--- a/htc/res/offmode_charging_images/charging_full_00085.png
+++ b/htc/res/offmode_charging_images/charging_full_00085.png
--- a/htc/res/offmode_charging_images/charging_full_00089.png
+++ b/htc/res/offmode_charging_images/charging_full_00089.png
--- a/htc/res/offmode_charging_images/charging_full_00091.png
+++ b/htc/res/offmode_charging_images/charging_full_00091.png
--- a/htc/res/offmode_charging_images/charging_full_00095.png
+++ b/htc/res/offmode_charging_images/charging_full_00095.png
--- a/htc/res/offmode_charging_images/charging_full_00099.png
+++ b/htc/res/offmode_charging_images/charging_full_00099.png
--- a/utilities/Android.mk
+++ b/utilities/Android.mk
@ -84,6 +84,14 @@ LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
 LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := htcbatt
+LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
+LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
 endif

 endif
--- a/utilities/choice_fn
+++ b/utilities/choice_fn
--- a/utilities/htcbatt
+++ b/utilities/htcbatt
--- a/utilities/offmode_charging
+++ b/utilities/offmode_charging