From 9b8accc6df8a8b036ad2924f1f59e9419b6c6883 Mon Sep 17 00:00:00 2001 From: sbrissen Date: Mon, 14 Oct 2013 08:44:26 -0400 Subject: fix lpm mode, remove aosp charger and use the samsung one This fixes the screen not turning off while charging when tablet is off --- n5110.mk | 9 ++------- res/charger/battery_0.png | Bin 5515 -> 0 bytes res/charger/battery_1.png | Bin 5549 -> 0 bytes res/charger/battery_2.png | Bin 5548 -> 0 bytes res/charger/battery_3.png | Bin 5548 -> 0 bytes res/charger/battery_4.png | Bin 5548 -> 0 bytes res/charger/battery_5.png | Bin 5522 -> 0 bytes res/charger/battery_charge.png | Bin 7126 -> 0 bytes res/charger/battery_fail.png | Bin 7051 -> 0 bytes rootdir/lpm.rc | 14 ++++++++------ 10 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 res/charger/battery_0.png delete mode 100644 res/charger/battery_1.png delete mode 100644 res/charger/battery_2.png delete mode 100644 res/charger/battery_3.png delete mode 100644 res/charger/battery_4.png delete mode 100644 res/charger/battery_5.png delete mode 100644 res/charger/battery_charge.png delete mode 100644 res/charger/battery_fail.png diff --git a/n5110.mk b/n5110.mk index e48c598..8326936 100644 --- a/n5110.mk +++ b/n5110.mk @@ -64,11 +64,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PROPERTY_OVERRIDES += \ mobiledata.interfaces=wlan0 -# Charger -PRODUCT_PACKAGES += \ - charger \ - charger_res_images - # These are the hardware-specific features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml @@ -78,6 +73,6 @@ PRODUCT_CHARACTERISTICS := tablet $(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk) -$(call inherit-product, device/samsung/smdk4412-common/common.mk) +$(call inherit-product, vendor/samsung/n5110/n5110-vendor.mk) -$(call inherit-product-if-exists, vendor/samsung/n5110/n5110-vendor.mk) \ No newline at end of file +$(call inherit-product, device/samsung/smdk4412-common/common.mk) \ No newline at end of file diff --git a/res/charger/battery_0.png b/res/charger/battery_0.png deleted file mode 100644 index 38b888c..0000000 Binary files a/res/charger/battery_0.png and /dev/null differ diff --git a/res/charger/battery_1.png b/res/charger/battery_1.png deleted file mode 100644 index 03f4226..0000000 Binary files a/res/charger/battery_1.png and /dev/null differ diff --git a/res/charger/battery_2.png b/res/charger/battery_2.png deleted file mode 100644 index 296959e..0000000 Binary files a/res/charger/battery_2.png and /dev/null differ diff --git a/res/charger/battery_3.png b/res/charger/battery_3.png deleted file mode 100644 index 97a5dfd..0000000 Binary files a/res/charger/battery_3.png and /dev/null differ diff --git a/res/charger/battery_4.png b/res/charger/battery_4.png deleted file mode 100644 index 63865c2..0000000 Binary files a/res/charger/battery_4.png and /dev/null differ diff --git a/res/charger/battery_5.png b/res/charger/battery_5.png deleted file mode 100644 index eec62b0..0000000 Binary files a/res/charger/battery_5.png and /dev/null differ diff --git a/res/charger/battery_charge.png b/res/charger/battery_charge.png deleted file mode 100644 index c1d2856..0000000 Binary files a/res/charger/battery_charge.png and /dev/null differ diff --git a/res/charger/battery_fail.png b/res/charger/battery_fail.png deleted file mode 100644 index 9099d02..0000000 Binary files a/res/charger/battery_fail.png and /dev/null differ diff --git a/rootdir/lpm.rc b/rootdir/lpm.rc index 7e5d382..5f4bb14 100644 --- a/rootdir/lpm.rc +++ b/rootdir/lpm.rc @@ -23,7 +23,7 @@ on init #mount /tmp /tmp tmpfs on early-fs - insmod /lib/modules/vibrator.ko +# insmod /lib/modules/vibrator.ko mount ext4 /dev/block/mmcblk0p9 /system ro wait noatime @@ -50,19 +50,21 @@ on boot service debuggerd /system/bin/debuggerd - service ueventd /sbin/ueventd +service ueventd /sbin/ueventd critical #service console /bin/sh service console /system/bin/sh console + +service playlpm /system/bin/playlpm + user root service immvibed /system/bin/immvibed oneshot - -service charger /charger - class default - user root + +service lpmkey /system/bin/lpmkey + user root # adbd is controlled by the persist.service.adb.enable system property service adbd /sbin/adbd -- cgit v1.1