summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawit Pornkitprasan <p.pawit@gmail.com>2012-09-26 13:39:31 -0400
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-09-26 13:39:31 -0400
commit3e14e639e8f1adc8c0f257145fd9df9663bb11d5 (patch)
tree411f38186f1650c365449191264560c408c0e67d
parente3936f5145a98419eb2861f07c1476bdfa2fae6f (diff)
parentf5e96c95120fb4d35d246ae39bb46205613a12b4 (diff)
downloaddevice_samsung_aries-common-3e14e639e8f1adc8c0f257145fd9df9663bb11d5.zip
device_samsung_aries-common-3e14e639e8f1adc8c0f257145fd9df9663bb11d5.tar.gz
device_samsung_aries-common-3e14e639e8f1adc8c0f257145fd9df9663bb11d5.tar.bz2
Merge "aries-common: allow suspend in charger" into jellybean
-rw-r--r--BoardConfigCommon.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 658f0b4..f3992d8 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -118,5 +118,8 @@ BOARD_ALLOW_EGL_HIBERNATION := true
# hwcomposer: custom vsync ioctl
BOARD_CUSTOM_VSYNC_IOCTL := true
+# Suspend in charger to disable capacitive keys
+BOARD_ALLOW_SUSPEND_IN_CHARGER := true
+
# Include aries specific stuff
-include device/samsung/aries-common/Android.mk