am 0604520d: am 65ddbc2c: Disable translucent bars on Manta.
* commit '0604520d80515340c439c9e7dff183966a29aca5':
Disable translucent bars on Manta.
diff --git a/device.mk b/device.mk
index 1a73c56..3bf0653 100644
--- a/device.mk
+++ b/device.mk
@@ -184,7 +184,6 @@
# for off charging mode
PRODUCT_PACKAGES += \
- charger \
charger_res_images
$(call inherit-product-if-exists, hardware/samsung_slsi/exynos5/exynos5.mk)
diff --git a/health/healthd-manta.cpp b/health/healthd-manta.cpp
index 94a42ee..3107da0 100644
--- a/health/healthd-manta.cpp
+++ b/health/healthd-manta.cpp
@@ -211,7 +211,6 @@
props->batteryTemperature = 42; /* 4.2C */
props->batteryVoltage = 4242; /* 4242mV */
props->batteryLevel = 42; /* 42% */
- props->batteryCurrentNow = 42000;/* 42mA */
}
if (props->batteryStatus == BATTERY_STATUS_FULL &&
diff --git a/init.manta.rc b/init.manta.rc
index b7d28d7..fa6f2f3 100644
--- a/init.manta.rc
+++ b/init.manta.rc
@@ -198,6 +198,8 @@
service battery_charger /charger
class charger
+ critical
+ seclabel u:r:healthd:s0
# Set watchdog timer to 30 seconds and pet it every 10 seconds to get a 20 second margin
service watchdogd /sbin/watchdogd 10 20
diff --git a/kernel b/kernel
index 61e6df9..856239f 100644
--- a/kernel
+++ b/kernel
Binary files differ
diff --git a/recovery/recovery_ui.cpp b/recovery/recovery_ui.cpp
index 5d82755..5d02e4e 100644
--- a/recovery/recovery_ui.cpp
+++ b/recovery/recovery_ui.cpp
@@ -34,36 +34,10 @@
"wipe cache partition",
NULL };
-class MantaUI : public ScreenRecoveryUI {
- public:
- MantaUI() :
- consecutive_power_keys(0) {
- }
-
- virtual KeyAction CheckKey(int key) {
- if (IsKeyPressed(KEY_POWER) && key == KEY_VOLUMEUP) {
- return TOGGLE;
- }
- if (key == KEY_POWER) {
- ++consecutive_power_keys;
- if (consecutive_power_keys >= 7) {
- return REBOOT;
- }
- } else {
- consecutive_power_keys = 0;
- }
- return ENQUEUE;
- }
-
- private:
- int consecutive_power_keys;
-};
-
-
class MantaDevice : public Device {
public:
MantaDevice() :
- ui(new MantaUI) {
+ ui(new ScreenRecoveryUI) {
}
RecoveryUI* GetUI() { return ui; }