summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Jiejing <jiejing.zhang@freescale.com>2012-12-13 17:08:21 +0800
committerZhang Jiejing <jiejing.zhang@freescale.com>2012-12-13 17:11:25 +0800
commit1abfa9cc1daa8b95a47d738c4eaf58df18a41795 (patch)
tree8884eaa98d56d262ef74b2e9ddd940405306aa63
parent5502871fdc016d89a7e26a7b1c74cf71b6dafdc0 (diff)
ENGR00236052 add keychord driver in android config.
android use keychord to archive start function in init.rc with some key combo press. eg: service bugreport /system/bin/bugmailer.sh class main disabled oneshot keycodes 115 114 This service will start if VOL-UP and VOL-DOWN press same time. it will start collect bug log, and snapshot and start a mail activity to send the bug report to a mail address. Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
-rw-r--r--arch/arm/configs/android_common_defconfig1
-rw-r--r--arch/arm/configs/imx6_android_defconfig2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/android_common_defconfig b/arch/arm/configs/android_common_defconfig
index fabb4c1c62f3..3c19cccc5868 100644
--- a/arch/arm/configs/android_common_defconfig
+++ b/arch/arm/configs/android_common_defconfig
@@ -234,6 +234,7 @@ CONFIG_MXC_GPU_VIV=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_KEYS=y
+CONFIG_INPUT_KEYCHORD=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOCKUP_DETECTOR=y
diff --git a/arch/arm/configs/imx6_android_defconfig b/arch/arm/configs/imx6_android_defconfig
index febbb79344f2..80a0f34a082a 100644
--- a/arch/arm/configs/imx6_android_defconfig
+++ b/arch/arm/configs/imx6_android_defconfig
@@ -1415,7 +1415,7 @@ CONFIG_INPUT_MISC=y
# CONFIG_INPUT_AD714X is not set
# CONFIG_INPUT_ATI_REMOTE is not set
# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_KEYCHORD is not set
+CONFIG_INPUT_KEYCHORD=y
# CONFIG_INPUT_KEYSPAN_REMOTE is not set
# CONFIG_INPUT_POWERMATE is not set
# CONFIG_INPUT_YEALINK is not set