summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Jiejing <jiejing.zhang@freescale.com>2012-12-13 17:08:21 +0800
committerTapani <tapani@vmail.me>2013-03-29 11:41:33 +0800
commit730c12b7f6fa1493aaf51b47ee4d6ada8ee3b500 (patch)
tree22d397c72f35cedd642f565dd96c803f0b855985
parentf9a9502e0ae9da2805f64d11e9d3569e95a0d5c9 (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 0d0e0a3ac67a..6049c0f73bdf 100644
--- a/arch/arm/configs/imx6_android_defconfig
+++ b/arch/arm/configs/imx6_android_defconfig
@@ -1401,7 +1401,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