am a628c31f: am 08d60ceb: Merge "Use LOCAL_MODULE_RELATIVE_PATH to fix multilib build warning."
* commit 'a628c31f3f202215789f170020f7cb5f8c4bb274':
Use LOCAL_MODULE_RELATIVE_PATH to fix multilib build warning.
diff --git a/device.mk b/device.mk
index 0154a01..1e4e0ae 100644
--- a/device.mk
+++ b/device.mk
@@ -190,7 +190,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..4dfea77 100644
--- a/health/healthd-manta.cpp
+++ b/health/healthd-manta.cpp
@@ -209,9 +209,8 @@
manta_bat_check_temp(props);
} else {
props->batteryTemperature = 42; /* 4.2C */
- props->batteryVoltage = 4242; /* 4242mV */
+ props->batteryVoltage = 4342; /* 4342mV */
props->batteryLevel = 42; /* 42% */
- props->batteryCurrentNow = 42000;/* 42mA */
}
if (props->batteryStatus == BATTERY_STATUS_FULL &&
@@ -298,7 +297,7 @@
if (access(config->batteryCurrentNowPath.string(), R_OK) == 0) {
manta_bat_batterypresent = true;
} else {
- KLOG_INFO("Missing battery, using fake battery data\n");
+ KLOG_INFO(LOG_TAG, "Missing battery, using fake battery data\n");
config->batteryCurrentNowPath.clear();
}
}
diff --git a/init.manta.rc b/init.manta.rc
index 9ead12f..cb3f6db 100644
--- a/init.manta.rc
+++ b/init.manta.rc
@@ -108,10 +108,10 @@
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-I/system/etc/wifi/wpa_supplicant_overlay.conf \
-O/data/misc/wifi/sockets \
- -puse_multi_chan_concurrent=1 -N -ip2p0 -Dnl80211 \
+ -N -ip2p0 -Dnl80211 \
-c/data/misc/wifi/p2p_supplicant.conf \
-I/system/etc/wifi/p2p_supplicant_overlay.conf \
- -puse_p2p_group_interface=1use_multi_chan_concurrent=1 \
+ -puse_p2p_group_interface=1 \
-e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
# we will start as root and wpa_supplicant will switch to user wifi
# after setting up the capabilities required for WEXT
@@ -178,6 +178,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 6170736..f7284f8 100644
--- a/kernel
+++ b/kernel
Binary files differ
diff --git a/overlay/packages/apps/Nfc/res/values/provisioning.xml b/overlay/packages/apps/Nfc/res/values/provisioning.xml
index 1ca59e3..0508900 100644
--- a/overlay/packages/apps/Nfc/res/values/provisioning.xml
+++ b/overlay/packages/apps/Nfc/res/values/provisioning.xml
@@ -17,12 +17,11 @@
<!-- NFC resources that may need to be customized
for different hardware or product builds. -->
<resources>
- <!-- Whether the device can receive NFC data in setup wizard -->
- <bool name="enable_nfc_provisioning">true</bool>
<!-- The accepted mime-types when NFC is enabled in setup wizard.
Mime-types must be lower case, wildcards are *not* accepted. -->
<string-array name="provisioning_mime_types">
<item>application/vnd.com.google.android.nfcprovision</item>
+ <item>application/com.android.managedprovisioning</item>
</string-array>
</resources>
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; }