am b8e3143a: am c7c78b0c: Merge "Allow kickstart_checker.sh to run in system group."
* commit 'b8e3143aa4ba02e5a5850248ac31e1b72248a6e8':
Allow kickstart_checker.sh to run in system group.
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 7e4f1f8..58f933a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -24,7 +24,7 @@
TARGET_RELEASETOOLS_EXTENSIONS := device/asus/deb
-TARGET_RECOVERY_FSTAB = device/asus/deb/recovery.fstab
+TARGET_RECOVERY_FSTAB = device/asus/deb/fstab.deb
-include vendor/asus/deb/BoardConfigVendor.mk
include device/asus/flo/BoardConfigCommon.mk
diff --git a/fstab.deb b/fstab.deb
index 0d0d263..b4675af 100644
--- a/fstab.deb
+++ b/fstab.deb
@@ -8,6 +8,18 @@
/dev/block/platform/msm_sdcc.1/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,errors=panic wait,check,encryptable=/dev/block/platform/msm_sdcc.1/by-name/metadata
/dev/block/platform/msm_sdcc.1/by-name/persist /persist ext4 nosuid,nodev,barrier=1,data=ordered,nodelalloc wait
/dev/block/platform/msm_sdcc.1/by-name/radio /firmware vfat ro,uid=1000,gid=1000,fmask=0337,dmask=0227,iocharset=iso8859-1,shortname=mixed,errors=remount-ro wait
+/dev/block/platform/msm_sdcc.1/by-name/radio /radio emmc defaults defaults
/dev/block/platform/msm_sdcc.1/by-name/boot /boot emmc defaults defaults
/dev/block/platform/msm_sdcc.1/by-name/recovery /recovery emmc defaults defaults
/dev/block/platform/msm_sdcc.1/by-name/misc /misc emmc defaults defaults
+/dev/block/platform/msm_sdcc.1/by-name/sbl1 /sbl1 emmc defaults defaults
+/dev/block/platform/msm_sdcc.1/by-name/sbl2 /sbl2 emmc defaults defaults
+/dev/block/platform/msm_sdcc.1/by-name/sbl3 /sbl3 emmc defaults defaults
+/dev/block/platform/msm_sdcc.1/by-name/tz /tz emmc defaults defaults
+/dev/block/platform/msm_sdcc.1/by-name/rpm /rpm emmc defaults defaults
+/dev/block/platform/msm_sdcc.1/by-name/aboot /aboot emmc defaults defaults
+/dev/block/platform/msm_sdcc.1/by-name/sbl2b /sbl2b emmc defaults defaults
+/dev/block/platform/msm_sdcc.1/by-name/sbl3b /sbl3b emmc defaults defaults
+/dev/block/platform/msm_sdcc.1/by-name/tzb /tzb emmc defaults defaults
+/dev/block/platform/msm_sdcc.1/by-name/rpmb /rpmb emmc defaults defaults
+/dev/block/platform/msm_sdcc.1/by-name/abootb /abootb emmc defaults defaults
diff --git a/init.deb.rc b/init.deb.rc
index a60a257..38e88dd 100644
--- a/init.deb.rc
+++ b/init.deb.rc
@@ -117,6 +117,8 @@
write /proc/sys/net/ipv6/conf/rmnet_sdio6/accept_ra 2
write /proc/sys/net/ipv6/conf/rmnet_sdio7/accept_ra 2
+ #Enable logging of the wake up reasons in the kernel log
+ write /sys/module/msm_show_resume_irq/parameters/debug_mask 1
# NFC: create data/nfc for nv storage
mkdir /data/nfc 770 nfc nfc
@@ -420,8 +422,10 @@
# Adjust socket buffer to enlarge TCP receive window for high bandwidth (e.g. DO-RevB)
write /proc/sys/net/ipv4/tcp_adv_win_scale 1
-service charger /charger
+service charger /sbin/healthd -c
class charger
+ critical
+ seclabel u:r:healthd:s0
# virtual sdcard daemon running as media_rw (1023)
service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated
diff --git a/overlay/frameworks/base/core/res/res/values-be/config.xml b/overlay/frameworks/base/core/res/res/values-be/config.xml
deleted file mode 100644
index c9598c4..0000000
--- a/overlay/frameworks/base/core/res/res/values-be/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="config_usbHostBlacklist">
- <item msgid="2854983642221012800">"/dev/bus/usb/001"</item>
- </string-array>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-et/config.xml b/overlay/frameworks/base/core/res/res/values-et/config.xml
deleted file mode 100644
index c9598c4..0000000
--- a/overlay/frameworks/base/core/res/res/values-et/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="config_usbHostBlacklist">
- <item msgid="2854983642221012800">"/dev/bus/usb/001"</item>
- </string-array>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-ms/config.xml b/overlay/frameworks/base/core/res/res/values-ms/config.xml
deleted file mode 100644
index c9598c4..0000000
--- a/overlay/frameworks/base/core/res/res/values-ms/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="config_usbHostBlacklist">
- <item msgid="2854983642221012800">"/dev/bus/usb/001"</item>
- </string-array>
-</resources>
diff --git a/overlay/packages/apps/Nfc/res/values/provisioning.xml b/overlay/packages/apps/Nfc/res/values/provisioning.xml
index 1ca59e3..c996eb5 100644
--- a/overlay/packages/apps/Nfc/res/values/provisioning.xml
+++ b/overlay/packages/apps/Nfc/res/values/provisioning.xml
@@ -17,12 +17,10 @@
<!-- 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.fstab b/recovery.fstab
deleted file mode 100644
index b72959d..0000000
--- a/recovery.fstab
+++ /dev/null
@@ -1,18 +0,0 @@
-/dev/block/platform/msm_sdcc.1/by-name/boot /boot emmc defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/recovery /recovery emmc defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/misc /misc emmc defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/system /system ext4 defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/userdata /data ext4 defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/cache /cache ext4 defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/radio /radio emmc defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/sbl1 /sbl1 emmc defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/sbl2 /sbl2 emmc defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/sbl3 /sbl3 emmc defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/tz /tz emmc defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/rpm /rpm emmc defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/aboot /aboot emmc defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/sbl2b /sbl2b emmc defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/sbl3b /sbl3b emmc defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/tzb /tzb emmc defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/rpmb /rpmb emmc defaults defaults
-/dev/block/platform/msm_sdcc.1/by-name/abootb /abootb emmc defaults defaults
diff --git a/recovery/recovery_ui.cpp b/recovery/recovery_ui.cpp
index ba6bab0..1a008a7 100644
--- a/recovery/recovery_ui.cpp
+++ b/recovery/recovery_ui.cpp
@@ -34,37 +34,11 @@
"wipe cache partition",
NULL };
-class DebUI : public ScreenRecoveryUI
-{
-public:
- DebUI() :
- 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 DebDevice : public Device
{
public:
DebDevice() :
- ui(new DebUI) {
+ ui(new ScreenRecoveryUI) {
}
RecoveryUI* GetUI() { return ui; }
