am 77f8e6b5: Merge "Add overlay for config_speed_up_audio_on_mt_calls"
* commit '77f8e6b51a8f26ea9288a9186179511a92c07df0':
Add overlay for config_speed_up_audio_on_mt_calls
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 43d8531..fd101c8 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -90,4 +90,6 @@
TARGET_RELEASETOOLS_EXTENSIONS := device/lge/mako
+BOARD_CHARGER_ENABLE_SUSPEND := true
+
-include vendor/lge/mako/BoardConfigVendor.mk
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 3ce1c8b..ae11cd8 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -61,6 +61,19 @@
$(call add-clean-step, rm -f $(OUT_DIR)/target/product/mako/root/default.prop)
$(call add-clean-step, rm -f $(OUT_DIR)/target/product/mako/recovery/root/default.prop)
$(call add-clean-step, rm -f $(OUT_DIR)/target/product/mako/system/build.prop)
+$(call add-clean-step, rm -f $(OUT_DIR)/target/product/mako/root/default.prop)
+$(call add-clean-step, rm -f $(OUT_DIR)/target/product/mako/recovery/root/default.prop)
+$(call add-clean-step, rm -f $(OUT_DIR)/target/product/mako/system/build.prop)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/mako/obj/EXECUTABLES/mm-vdec-omx-test*_intermediates)
+$(call add-clean-step, rm -f $(OUT_DIR)/target/product/mako/symbols/system/bin/mm-vdec-omx-test*)
+$(call add-clean-step, rm -f $(OUT_DIR)/target/product/mako/system/bin/mm-vdec-omx-test*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/mako/obj/EXECUTABLES/charger_touch_intermediates)
+$(call add-clean-step, rm -f $(OUT_DIR)/target/product/mako/symbols/system/bin/charger_touch)
+$(call add-clean-step, rm -f $(OUT_DIR)/target/product/mako/system/bin/charger_touch)
+$(call add-clean-step, rm -f $(OUT_DIR)/target/product/mako/obj/NOTICE_FILES/src/system/bin/charger_touch.txt)
+$(call add-clean-step, rm -f $(OUT_DIR)/target/product/mako/root/default.prop)
+$(call add-clean-step, rm -f $(OUT_DIR)/target/product/mako/recovery/root/default.prop)
+$(call add-clean-step, rm -f $(OUT_DIR)/target/product/mako/system/build.prop)
$(call add-clean-step, rm -f $(OUT_DIR)/target/product/mako/root/default.prop)
$(call add-clean-step, rm -f $(OUT_DIR)/target/product/mako/recovery/root/default.prop)
diff --git a/board-info.txt b/board-info.txt
index a68002d..3e554ae 100644
--- a/board-info.txt
+++ b/board-info.txt
@@ -1,2 +1 @@
-require board=mako|J1TM
-
+require board=mako
diff --git a/device.mk b/device.mk
index 0206a87..683bce3 100644
--- a/device.mk
+++ b/device.mk
@@ -153,7 +153,7 @@
ro.telephony.call_ring.multiple=0
#Upto 3 layers can go through overlays
-PRODUCT_PROPERTY_OVERRIDES += debug.mdpcomp.maxlayer=3
+PRODUCT_PROPERTY_OVERRIDES += persist.hwc.mdpcomp.enable=true
PRODUCT_CHARACTERISTICS := nosdcard
@@ -202,8 +202,7 @@
libmmcamera_interface
PRODUCT_PACKAGES += \
- mm-vdec-omx-test \
- mm-venc-omx-test720p \
+ libmm-omxcore \
libdivxdrmdecrypt \
libOmxVdec \
libOmxVenc \
@@ -221,8 +220,10 @@
PRODUCT_PACKAGES += \
bdAddrLoader \
libwfcu \
- conn_init \
- charger_touch
+ conn_init
+
+PRODUCT_PACKAGES += \
+ keystore.msm8960
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
rild.libpath=/system/lib/libril-qc-qmi-1.so
@@ -244,6 +245,9 @@
PRODUCT_PROPERTY_OVERRIDES += \
debug.egl.recordable.rgba8888=1
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.qc.sensors.wl_dis=true
+
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
persist.sys.usb.config=mtp
diff --git a/init.mako.rc b/init.mako.rc
index ad7cf50..a07ca02 100644
--- a/init.mako.rc
+++ b/init.mako.rc
@@ -39,6 +39,15 @@
mkdir /persist 0771 system system
mkdir /firmware 0771 system system
+on init
+ # Setup custom emergency number list based on
+ # the MCC. This is needed by RIL.
+ setprop persist.radio.custom_ecc "1"
+ setprop persist.radio.custom_ecc_mcc "{234,235,424,426,427,430,431:999},{334:060,066},{422:9999},{452:113,114,115}"
+ setprop persist.radio.custom_ecc_mcc_ex "{450:111,112,113,119,125,127},{724:190}"
+ setprop persist.radio.custom_ecc_voice "{515:117}"
+ setprop persist.radio.custom_ecc_hard "911,*911,#911,112,999,000,08,118,120,122,110,119,995,111,113,125,127"
+
on fs
mount_all ./fstab.mako
setprop ro.crypto.fuse_sdcard true
@@ -249,6 +258,9 @@
write /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq 384000
write /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq 384000
write /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq 384000
+ write /sys/devices/system/cpu/cpu1/online 0
+ write /sys/devices/system/cpu/cpu2/online 0
+ write /sys/devices/system/cpu/cpu3/online 0
on property:init.svc.wpa_supplicant=stopped
stop dhcpcd
diff --git a/nfc/libnfc-brcm.conf b/nfc/libnfc-brcm.conf
index 8842a33..75f36ef 100644
--- a/nfc/libnfc-brcm.conf
+++ b/nfc/libnfc-brcm.conf
@@ -46,7 +46,7 @@
# Delay after turning off chip, before USERIAL_close returns (default 0)
#
#POWER_ON_DELAY=300
-#PRE_POWER_OFF_DELAY=0
+PRE_POWER_OFF_DELAY=10
#POST_POWER_OFF_DELAY=0
###############################################################################
@@ -119,7 +119,7 @@
# SE that is detected by the stack. This value might be used when the phone
# supports multiple SE (e.g. 0xF3 and 0xF4) but you want to force it to use
# one of them (e.g. 0xF4).
-#ACTIVE_SE=0xF3
+ACTIVE_SE=0xF4
###############################################################################
# Configure the NFC Extras to open and use a static pipe. If the value is
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 2ddce57..ed8be6b 100644
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -21,21 +21,21 @@
<item name="none">0</item>
<item name="screen.on">42.4</item>
<item name="screen.full">211.6</item>
- <item name="bluetooth.active">66.2</item>
+ <item name="bluetooth.active">59.22</item>
<item name="bluetooth.on">0.7</item>
- <item name="wifi.on">3.16</item>
- <item name="wifi.active">62.09</item>
- <item name="wifi.scan">52.1</item>
+ <item name="wifi.on">4.69</item>
+ <item name="wifi.active">25.14</item>
+ <item name="wifi.scan">19.61</item>
<item name="dsp.audio">0.1</item>
<item name="dsp.video">0.1</item>
- <item name="gps.on">59.7</item>
+ <item name="gps.on">20.9</item>
<item name="radio.active">185.6</item>
<!-- The current consumed by the radio when it is scanning for a signal -->
<item name="radio.scanning">122.68</item>
<!-- Current consumed by the radio at different signal strengths, when paging -->
<array name="radio.on"> <!-- Strength 0 to BINS-1 -->
- <value>1.7</value>
- <value>2.4</value>
+ <value>1.16</value>
+ <value>2.15</value>
</array>
<!-- Different CPU speeds as reported in
/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state -->
@@ -55,7 +55,7 @@
</array>
<!-- Power consumption when CPU is idle -->
<item name="cpu.idle">3.5</item>
- <item name="cpu.awake">35.33</item>
+ <item name="cpu.awake">10.43</item>
<!-- Power consumption at different speeds -->
<array name="cpu.active">
<value>92.6</value> <!-- 384 MHz CPU speed -->
diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
index bd281b6..5e18358 100644
--- a/proprietary-blobs.txt
+++ b/proprietary-blobs.txt
@@ -28,7 +28,6 @@
/system/bin/mpdecision
/system/bin/netmgrd
/system/bin/nl_listener
-/system/bin/PktRspTest
/system/bin/port-bridge
/system/bin/qcks
/system/bin/qmuxd
@@ -36,12 +35,6 @@
/system/bin/radish
/system/bin/rmt_storage
/system/bin/sensors.qcom
-/system/bin/sns_cm_conc_test
-/system/bin/sns_cm_test
-/system/bin/sns_debug_file_test
-/system/bin/sns_dsps_tc0001
-/system/bin/sns_smr_loopback_test
-/system/bin/test_diag
/system/bin/thermald
/system/bin/usbhub
/system/bin/usbhub_init
@@ -163,7 +156,6 @@
/system/lib/libsc-a3xx.so
/system/lib/libsensor1.so
/system/lib/libsensor_reg.so
-/system/lib/libsensor_test.so
/system/lib/libsensor_user_cal.so
/system/lib/libstagefright_hdcp.so
/system/lib/libxml.so
@@ -175,4 +167,9 @@
/system/vendor/firmware/discretix/dxhdcp2.b02
/system/vendor/firmware/discretix/dxhdcp2.b03
/system/vendor/firmware/discretix/dxhdcp2.mdt
+/system/vendor/firmware/keymaster/keymaster.b00
+/system/vendor/firmware/keymaster/keymaster.b01
+/system/vendor/firmware/keymaster/keymaster.b02
+/system/vendor/firmware/keymaster/keymaster.b03
+/system/vendor/firmware/keymaster/keymaster.mdt
/system/vendor/lib/libdrmdecrypt.so