From a9ed1197b55dedb4521c271da1e48b3f0c667e67 Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Thu, 17 Aug 2017 12:03:49 -0700 Subject: [PATCH 01/53] Convert Taimen & Walleye audio_effect.conf to xml Converted .conf format to .xml using: vendor/box/user/mnaganov/audio-effects-conf/aeffects-conf2xml Bug: 37492580 Test: dumped the effectFactory state and check it was unchanged $ adb shell dumpsys media.audio_flinger | sed '/Clients:/q' Change-Id: I526e73e469f0ff6a0e2829358ccf2204323a6d98 Signed-off-by: Kevin Rocard --- aosp_walleye.mk | 2 +- audio_effects.conf | 331 --------------------------------------------- audio_effects.xml | 82 +++++++++++ 3 files changed, 83 insertions(+), 332 deletions(-) delete mode 100644 audio_effects.conf create mode 100644 audio_effects.xml diff --git a/aosp_walleye.mk b/aosp_walleye.mk index 0b8cdc9..1c23d25 100644 --- a/aosp_walleye.mk +++ b/aosp_walleye.mk @@ -28,7 +28,7 @@ PRODUCT_PACKAGES += \ WallpaperPicker PRODUCT_COPY_FILES += \ - device/google/muskie/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf + device/google/muskie/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml PRODUCT_RESTRICT_VENDOR_FILES := owner diff --git a/audio_effects.conf b/audio_effects.conf deleted file mode 100644 index 0741076..0000000 --- a/audio_effects.conf +++ /dev/null @@ -1,331 +0,0 @@ -# List of effect libraries to load. Each library element must contain a "path" element -# giving the full path of the library .so file. -# libraries { -# { -# path -# } -# } -libraries { - bundle { - path /vendor/lib/soundfx/libbundlewrapper.so - } - reverb { - path /vendor/lib/soundfx/libreverbwrapper.so - } - visualizer_sw { - path /vendor/lib/soundfx/libvisualizer.so - } - visualizer_hw { - path /vendor/lib/soundfx/libqcomvisualizer.so - } - downmix { - path /vendor/lib/soundfx/libdownmix.so - } - loudness_enhancer { - path /vendor/lib/soundfx/libldnhncr.so - } - proxy { - path /vendor/lib/soundfx/libeffectproxy.so - } - offload_bundle { - path /vendor/lib/soundfx/libqcompostprocbundle.so - } - audio_pre_processing { - path /vendor/lib/soundfx/libqcomvoiceprocessing.so - } - volume_listener { - path /vendor/lib/soundfx/libvolumelistener.so - } -} - -# Default pre-processing library. Add to audio_effect.conf "libraries" section if -# audio HAL implements support for default software audio pre-processing effects -# -# pre_processing { -# path /system/lib/soundfx/libaudiopreprocessing.so -# } - -# list of effects to load. Each effect element must contain a "library" and a "uuid" element. -# The value of the "library" element must correspond to the name of one library element in the -# "libraries" element. -# The name of the effect element is indicative, only the value of the "uuid" element -# designates the effect. -# The uuid is the implementation specific UUID as specified by the effect vendor. This is not the -# generic effect type UUID. -# effects { -# { -# library -# uuid -# } -# ... -# } - -effects { - -# additions for the proxy implementation -# Proxy implementation - #effectname { - #library proxy - #uuid xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx - - # SW implemetation of the effect. Added as a node under the proxy to - # indicate this as a sub effect. - #libsw { - #library libSW - #uuid yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy - #} End of SW effect - - # HW implementation of the effect. Added as a node under the proxy to - # indicate this as a sub effect. - #libhw { - #library libHW - #uuid zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzzz - #}End of HW effect - #} End of effect proxy - - bassboost { - library proxy - uuid 14804144-a5ee-4d24-aa88-0002a5d5c51b - - libsw { - library bundle - uuid 8631f300-72e2-11df-b57e-0002a5d5c51b - } - - libhw { - library offload_bundle - uuid 2c4a8c24-1581-487f-94f6-0002a5d5c51b - } - } - virtualizer { - library proxy - uuid d3467faa-acc7-4d34-acaf-0002a5d5c51b - - libsw { - library bundle - uuid 1d4033c0-8557-11df-9f2d-0002a5d5c51b - } - - libhw { - library offload_bundle - uuid 509a4498-561a-4bea-b3b1-0002a5d5c51b - } - } - equalizer { - library proxy - uuid c8e70ecd-48ca-456e-8a4f-0002a5d5c51b - - libsw { - library bundle - uuid ce772f20-847d-11df-bb17-0002a5d5c51b - } - - libhw { - library offload_bundle - uuid a0dac280-401c-11e3-9379-0002a5d5c51b - } - } - volume { - library bundle - uuid 119341a0-8469-11df-81f9-0002a5d5c51b - } - reverb_env_aux { - library proxy - uuid 48404ac9-d202-4ccc-bf84-0002a5d5c51b - - libsw { - library reverb - uuid 4a387fc0-8ab3-11df-8bad-0002a5d5c51b - } - - libhw { - library offload_bundle - uuid 79a18026-18fd-4185-8233-0002a5d5c51b - } - } - reverb_env_ins { - library proxy - uuid b707403a-a1c1-4291-9573-0002a5d5c51b - - libsw { - library reverb - uuid c7a511a0-a3bb-11df-860e-0002a5d5c51b - } - - libhw { - library offload_bundle - uuid eb64ea04-973b-43d2-8f5e-0002a5d5c51b - } - } - reverb_pre_aux { - library proxy - uuid 1b78f587-6d1c-422e-8b84-0002a5d5c51b - - libsw { - library reverb - uuid f29a1400-a3bb-11df-8ddc-0002a5d5c51b - } - - libhw { - library offload_bundle - uuid 6987be09-b142-4b41-9056-0002a5d5c51b - } - } - reverb_pre_ins { - library proxy - uuid f3e178d2-ebcb-408e-8357-0002a5d5c51b - - libsw { - library reverb - uuid 172cdf00-a3bc-11df-a72f-0002a5d5c51b - } - - libhw { - library offload_bundle - uuid aa2bebf6-47cf-4613-9bca-0002a5d5c51b - } - } - visualizer { - library proxy - uuid 1d0a1a53-7d5d-48f2-8e71-27fbd10d842c - - libsw { - library visualizer_sw - uuid d069d9e0-8329-11df-9168-0002a5d5c51b - } - - libhw { - library visualizer_hw - uuid 7a8044a0-1a71-11e3-a184-0002a5d5c51b - } - } - downmix { - library downmix - uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f - } - loudness_enhancer { - library loudness_enhancer - uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c - } - aec { - library audio_pre_processing - uuid 5d593ae0-1ef9-11e7-93ae-92361f002671 - } - ns { - library audio_pre_processing - uuid 5d593d56-1ef9-11e7-93ae-92361f002671 - } - music_helper { - library volume_listener - uuid 08b8b058-0590-11e5-ac71-0025b32654a0 - } - ring_helper { - library volume_listener - uuid 0956df94-0590-11e5-bdbe-0025b32654a0 - } - alarm_helper { - library volume_listener - uuid 09f303e2-0590-11e5-8fdb-0025b32654a0 - } - # voice_helper is called when stream type is voice_call in VoIP usecase - voice_helper { - library volume_listener - uuid 0ace5c08-0590-11e5-ae9e-0025b32654a0 - } - notification_helper { - library volume_listener - uuid 0b776dde-0590-11e5-81ba-0025b32654a0 - } -} - -# additional effect from vendor -# UUID generated using version 1 - -output_session_processing { - music { - music_helper { - } - } - ring { - ring_helper { - } - } - alarm { - alarm_helper { - } - } - # stream type voice_call is used for VoIP call - voice_call { - voice_helper { - } - } - notification { - notification_helper { - } - } -} - -pre_processing { - voice_communication { - aec { - } - ns { - } - } -} - -# Default pre-processing effects. Add to audio_effect.conf "effects" section if -# audio HAL implements support for them. -# -# agc { -# library pre_processing -# uuid aa8130e0-66fc-11e0-bad0-0002a5d5c51b -# } -# aec { -# library pre_processing -# uuid bb392ec0-8d4d-11e0-a896-0002a5d5c51b -# } -# ns { -# library pre_processing -# uuid c06c8400-8e06-11e0-9cb6-0002a5d5c51b -# } - -# Audio preprocessor configurations. -# The pre processor configuration consists in a list of elements each describing -# pre processor settings for a given input source. Valid input source names are: -# "mic", "camcorder", "voice_recognition", "voice_communication" -# Each input source element contains a list of effects elements. The name of the effect -# element must be the name of one of the effects in the "effects" list of the file. -# Each effect element may optionally contain a list of parameters and their -# default value to apply when the pre processor effect is created. -# A parameter is defined by a "param" element and a "value" element. Each of these elements -# consists in one or more elements specifying a type followed by a value. -# The types defined are: "int", "short", "float", "bool" and "string" -# When both "param" and "value" are a single int, a simple form is allowed where just -# the param and value pair is present in the parameter description -# pre_processing { -# { -# { -# { -# param { -# int|short|float|bool|string -# [ int|short|float|bool|string ] -# ... -# } -# value { -# int|short|float|bool|string -# [ int|short|float|bool|string ] -# ... -# } -# } -# { } -# ... -# } -# ... -# } -# ... -# } - -# -# TODO: add default audio pre processor configurations after debug and tuning phase -# diff --git a/audio_effects.xml b/audio_effects.xml new file mode 100644 index 0000000..704e53c --- /dev/null +++ b/audio_effects.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2dc4f2ef25ad172c496504046326fa3dcc018f8e Mon Sep 17 00:00:00 2001 From: Ningyuan Wang Date: Fri, 25 Aug 2017 14:06:38 -0700 Subject: [PATCH 02/53] MW wifi: Remove PNO back off parameters in WCNSS_qcom_cfg.ini On 2016 and 2017 devices, we use nl80211 scan plans to back off pno scans. These parameters in WCNSS_qcom_cfg.ini are no longer needed. Remove them to avoid confusion. Bug: 64295148 Test: compile Test: wifi pno scan works Change-Id: I9c0babd6addb31e919b6eb009d8773fd93ec31d4 --- WCNSS_qcom_cfg.ini | 8 -------- 1 file changed, 8 deletions(-) diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini index 875b6c0..cf5ecfb 100644 --- a/WCNSS_qcom_cfg.ini +++ b/WCNSS_qcom_cfg.ini @@ -265,14 +265,6 @@ gActiveMinChannelTime=20 gPNOScanSupport=1 -# Perform PNO fast scan this many number of times -gPNOScanTimerRepeatValue=6 - -# PNO slow scan period = gPNOSlowScanMultiplier times PNO fast scan period -# Example: fast scan period is passed from framework (default = 10 sec), then -# PNO slow scan period = 60 sec. -gPNOSlowScanMultiplier=6 - # Enable or Disable Extended Scan (GScan) # 1=Enable (default), 0=Disable gExtScanEnable=1 From 88e5ec1a7f309aa08e44ba97f039008a463c9ed0 Mon Sep 17 00:00:00 2001 From: Jeff Vander Stoep Date: Thu, 5 Oct 2017 14:43:45 -0700 Subject: [PATCH 03/53] sepolicy: add owners file Test: build Change-Id: Ifdca07d6e652b26e4fbfd25047a8c80c6013717a --- sepolicy/OWNERS | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sepolicy/OWNERS diff --git a/sepolicy/OWNERS b/sepolicy/OWNERS new file mode 100644 index 0000000..4bd7e34 --- /dev/null +++ b/sepolicy/OWNERS @@ -0,0 +1,6 @@ +nnk@google.com +jeffv@google.com +klyubin@google.com +dcashman@google.com +jbires@google.com +sspatil@google.com From eb22da8dbc48a50b88a18860e899f8bbfd3c830a Mon Sep 17 00:00:00 2001 From: Ruchi Kandoi Date: Wed, 25 Oct 2017 08:43:09 -0700 Subject: [PATCH 04/53] Disable DCDC bypass for NFC Reader mode. Test: Push the config file. Toggle NFC. Bug: 67959484 Change-Id: Ie8c73299b2b5e041dc246f6a154bc77bbf876b2d --- nfc/libnfc-nxp.muskie.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nfc/libnfc-nxp.muskie.conf b/nfc/libnfc-nxp.muskie.conf index 90078e5..973dee6 100644 --- a/nfc/libnfc-nxp.muskie.conf +++ b/nfc/libnfc-nxp.muskie.conf @@ -84,7 +84,7 @@ NXP_EXT_TVDD_CFG_1={20, 02, 0F, 01, A0, 0E, 0B, 31, 01, 01, 31, 00, 00, 00, 01, ############################################################################### #config2: use DCDC in CE, use Tx_Pwr_Req, set CFG2 mode, SLALM, #monitoring 5V from DCDC, 3.3V for both RM and CM, DCDCWaitTime=4.2ms -NXP_EXT_TVDD_CFG_2={20, 02, 0F, 01, A0, 0E, 0B, 11, 01, C2, B2, 00, BA, 1E, 18, 00, D0, 0C} +NXP_EXT_TVDD_CFG_2={20, 02, 0F, 01, A0, 0E, 0B, 11, 01, 82, B2, 00, BA, 1E, 18, 00, D0, 0C} ############################################################################### # NXP RF configuration ALM/PLM settings From ae780bce59f38ce08995dfb025b2da547b8ef948 Mon Sep 17 00:00:00 2001 From: Mohan Srinivasan Date: Wed, 18 Oct 2017 15:07:40 -0700 Subject: [PATCH 05/53] Switch to deadline IO scheduler post boot. The deadline IO scheduler results in lower latency SD, and pulls in latency outliers (especially when the flash starts getting fragmented). Switch to deadline post boot. Test: various workloads, both synthetic (fio) as well as actual workloads (app launch, ioshark). Bug: 63630139 Change-Id: I94b90ac09e921fdf01564bd4c6e1a1b809f3f8ec Signed-off-by: Mohan Srinivasan --- init-common.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/init-common.rc b/init-common.rc index ca1f526..5ce4f69 100644 --- a/init-common.rc +++ b/init-common.rc @@ -15,6 +15,8 @@ on property:sys.boot_completed=1 write /sys/block/sda/queue/iostats 1 write /sys/block/dm-0/queue/read_ahead_kb 512 write /sys/block/dm-1/queue/read_ahead_kb 512 + write /sys/block/sda/queue/scheduler deadline + write /sys/block/sde/queue/scheduler deadline on property:sys.boot_completed=1 && property:ro.build.type=user write /proc/sys/kernel/modules_disabled 1 From 304cb6d6fac46e2be57d4252d5e95ce989fc21fa Mon Sep 17 00:00:00 2001 From: Siqi Lin Date: Mon, 30 Oct 2017 15:27:58 -0700 Subject: [PATCH 06/53] Add walleye_kernel_debug_* targets Set paths for kernel modules for the new debug targets. The kernel to use for each target is specified in the lunch target Makefile. Bug: 68266758 Test: lunch new targets and make Change-Id: I19966b9c3f85c52a6f140ad6e761c5580d28ef55 --- device-common.mk | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/device-common.mk b/device-common.mk index 29df59a..5e9e696 100644 --- a/device-common.mk +++ b/device-common.mk @@ -90,6 +90,34 @@ BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/kasan/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/kasan/synaptics_dsx_fw_update_htc.ko \ device/google/wahoo-kernel/kasan/htc_battery.ko +else ifeq (,$(filter-out walleye_kernel_debug_memory, $(TARGET_PRODUCT))) +# if TARGET == walleye_kernel_debug_memory +BOARD_VENDOR_KERNEL_MODULES += \ + device/google/wahoo-kernel/debug_memory/synaptics_dsx_core_htc.ko \ + device/google/wahoo-kernel/debug_memory/synaptics_dsx_rmi_dev_htc.ko \ + device/google/wahoo-kernel/debug_memory/synaptics_dsx_fw_update_htc.ko \ + device/google/wahoo-kernel/debug_memory/htc_battery.ko +else ifeq (,$(filter-out walleye_kernel_debug_locking, $(TARGET_PRODUCT))) +# if TARGET == walleye_kernel_debug_locking +BOARD_VENDOR_KERNEL_MODULES += \ + device/google/wahoo-kernel/debug_locking/synaptics_dsx_core_htc.ko \ + device/google/wahoo-kernel/debug_locking/synaptics_dsx_rmi_dev_htc.ko \ + device/google/wahoo-kernel/debug_locking/synaptics_dsx_fw_update_htc.ko \ + device/google/wahoo-kernel/debug_locking/htc_battery.ko +else ifeq (,$(filter-out walleye_kernel_debug_hang, $(TARGET_PRODUCT))) +# if TARGET == walleye_kernel_debug_hang +BOARD_VENDOR_KERNEL_MODULES += \ + device/google/wahoo-kernel/debug_hang/synaptics_dsx_core_htc.ko \ + device/google/wahoo-kernel/debug_hang/synaptics_dsx_rmi_dev_htc.ko \ + device/google/wahoo-kernel/debug_hang/synaptics_dsx_fw_update_htc.ko \ + device/google/wahoo-kernel/debug_hang/htc_battery.ko +else ifeq (,$(filter-out walleye_kernel_debug_api, $(TARGET_PRODUCT))) +# if TARGET == walleye_kernel_debug_api +BOARD_VENDOR_KERNEL_MODULES += \ + device/google/wahoo-kernel/debug_api/synaptics_dsx_core_htc.ko \ + device/google/wahoo-kernel/debug_api/synaptics_dsx_rmi_dev_htc.ko \ + device/google/wahoo-kernel/debug_api/synaptics_dsx_fw_update_htc.ko \ + device/google/wahoo-kernel/debug_api/htc_battery.ko else BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/synaptics_dsx_core_htc.ko \ From bbef82c0172647ae063873e51cce331f593dd44d Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 20 Nov 2017 10:48:43 -0800 Subject: [PATCH 07/53] Add system/framework/qcrilhook.jar BUG:69427786 TEST: built and flashed walleye Change-Id: I6eb59bc4afa7416720c60fc76b5d25c412de77e9 --- self-extractors/extract-lists.txt | 1 + self-extractors/qcom/staging/device-partial.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt index f97a318..d6567c5 100644 --- a/self-extractors/extract-lists.txt +++ b/self-extractors/extract-lists.txt @@ -19,6 +19,7 @@ system/framework/com.quicinc.cne.api-V1.0-java.jar \ system/framework/com.quicinc.cne.jar \ system/framework/embmslibrary.jar \ + system/framework/qcrilhook.jar \ system/framework/rcsimssettings.jar \ system/framework/vendor.qti.qcril.am-V1.0-java.jar \ system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so \ diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk index 983ab3a..0f4efa5 100644 --- a/self-extractors/qcom/staging/device-partial.mk +++ b/self-extractors/qcom/staging/device-partial.mk @@ -29,6 +29,7 @@ PRODUCT_COPY_FILES := \ vendor/qcom/walleye/proprietary/com.quicinc.cne.jar:system/framework/com.quicinc.cne.jar:qcom \ vendor/qcom/walleye/proprietary/embmslibrary.jar:system/framework/embmslibrary.jar:qcom \ vendor/qcom/walleye/proprietary/rcsimssettings.jar:system/framework/rcsimssettings.jar:qcom \ + vendor/qcom/walleye/proprietary/qcrilhook.jar:system/framework/qcrilhook.jar:qcom \ vendor/qcom/walleye/proprietary/vendor.qti.qcril.am-V1.0-java.jar:system/framework/vendor.qti.qcril.am-V1.0-java.jar:qcom \ vendor/qcom/walleye/proprietary/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \ vendor/qcom/walleye/proprietary/lib64/libaptX_encoder.so:system/lib64/libaptX_encoder.so:qcom \ From 8ffcefd27ef03d280ee75199d05b1f36a138d8bf Mon Sep 17 00:00:00 2001 From: Steve Pfetsch Date: Mon, 20 Nov 2017 17:12:49 -0800 Subject: [PATCH 08/53] walleye: add separate charger kernel module config Bug: 69498902 Change-Id: I521483b17255705487dbf51f8b9f266de0ec4b78 --- device-common.mk | 3 ++- init.insmod_charger.cfg | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 init.insmod_charger.cfg diff --git a/device-common.mk b/device-common.mk index 5e9e696..20b898a 100644 --- a/device-common.mk +++ b/device-common.mk @@ -67,7 +67,8 @@ endif PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/init-common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init-$(PRODUCT_HARDWARE).rc \ $(LOCAL_PATH)/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_HARDWARE).usb.rc \ - $(LOCAL_PATH)/init.insmod.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cfg + $(LOCAL_PATH)/init.insmod.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cfg \ + $(LOCAL_PATH)/init.insmod_charger.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod_charger.cfg # Input device files PRODUCT_COPY_FILES += \ diff --git a/init.insmod_charger.cfg b/init.insmod_charger.cfg new file mode 100644 index 0000000..e3d267d --- /dev/null +++ b/init.insmod_charger.cfg @@ -0,0 +1,2 @@ +insmod /vendor/lib/modules/htc_battery.ko + From 94b472eac095dbcd1e2495e8ee0958be19371498 Mon Sep 17 00:00:00 2001 From: Vishwath Mohan Date: Tue, 21 Nov 2017 14:34:08 -0800 Subject: [PATCH 09/53] Add support for walleye_kcfi targets. Bug: 67506682 Test: lunch walleye_kcfi && m -j50 Change-Id: If97a15e03fa3db684d212da0633e6bbec01c2f47 --- device-common.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/device-common.mk b/device-common.mk index 5e9e696..5748283 100644 --- a/device-common.mk +++ b/device-common.mk @@ -90,6 +90,13 @@ BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/kasan/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/kasan/synaptics_dsx_fw_update_htc.ko \ device/google/wahoo-kernel/kasan/htc_battery.ko +else ifeq (,$(filter-out walleye_kcfi, $(TARGET_PRODUCT))) +# if TARGET_PRODUCT == *_kcfi +BOARD_VENDOR_KERNEL_MODULES += \ + device/google/wahoo-kernel/kcfi/synaptics_dsx_core_htc.ko \ + device/google/wahoo-kernel/kcfi/synaptics_dsx_rmi_dev_htc.ko \ + device/google/wahoo-kernel/kcfi/synaptics_dsx_fw_update_htc.ko \ + device/google/wahoo-kernel/kcfi/htc_battery.ko else ifeq (,$(filter-out walleye_kernel_debug_memory, $(TARGET_PRODUCT))) # if TARGET == walleye_kernel_debug_memory BOARD_VENDOR_KERNEL_MODULES += \ From cea583160adcd622a4c4f89c8831bfab96814bc9 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Thu, 16 Nov 2017 10:53:39 -0800 Subject: [PATCH 10/53] Support seamless transition to AoD Bug: 64155983 Test: set breakpoint and look at value Change-Id: I2ee1eb645ea9c7c367c78a27245318d595110a82 --- .../overlay/frameworks/base/core/res/res/values/config.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/walleye/overlay/frameworks/base/core/res/res/values/config.xml b/walleye/overlay/frameworks/base/core/res/res/values/config.xml index ba4da0a..7a6e8d7 100644 --- a/walleye/overlay/frameworks/base/core/res/res/values/config.xml +++ b/walleye/overlay/frameworks/base/core/res/res/values/config.xml @@ -115,4 +115,10 @@ during voice calls --> true + + false + + + true From 3a27ca64e678d710cceae18c9d840da8abc0d978 Mon Sep 17 00:00:00 2001 From: vincent_tew Date: Tue, 5 Dec 2017 14:10:28 +0800 Subject: [PATCH 11/53] audio: add missing path for hifi playback & record missing path for usb headset record + voice call concurrency usecase for example: 1. usb headset recording 2. make a voice call 3. switch to speaker mode 4. unable to find path 'hifi-record' BUG:70194145 Change-Id: Iadde6e479d2eb7c398b60da8f02455bbfeb7332a Signed-off-by: vincent_tew --- mixer_paths_tavil.xml | 45 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml index 51a2786..9ed87b7 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -84,8 +84,10 @@ + + @@ -117,6 +119,8 @@ + + @@ -210,6 +214,7 @@ + @@ -518,12 +523,6 @@ - - - - - - @@ -856,10 +855,31 @@ + + + + + + + + + + + + + + + + + + + + + @@ -872,10 +892,23 @@ + + + + + + + + + + + + + From f5a29247b45934114688a50318bce7161a29a642 Mon Sep 17 00:00:00 2001 From: Kumar Anand Date: Tue, 12 Dec 2017 14:20:24 -0800 Subject: [PATCH 12/53] wifi: walleye ini configuration update disable_scoring_for_roam=0 ; Enable BSSID scoring logic for roaming. This is turned off by in the new code drop and so to keep behavior same as 2017, this INI needs to turned on. Set gReportMaxLinkSpeed=0 to report actual link speed Set gGoForce11NFor11AC=1 for P2P GO Bug:69846237 Test: Manual Wifi Test Change-Id: Iaa7dc5ca8fba6a20deb7a56079aa0cffb38c2064 --- WCNSS_qcom_cfg.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini index 0e61b70..bc9c7d7 100644 --- a/WCNSS_qcom_cfg.ini +++ b/WCNSS_qcom_cfg.ini @@ -89,6 +89,7 @@ gTxChainMask1ss=0 # TPC power gSelfGenFrmPwr=3 +gReportMaxLinkSpeed=0 ################ NAN feature set start ################### # Enable or Disable NAN # 1=Enable (default), 0=Disable @@ -403,6 +404,7 @@ gRoamOffloadEnabled=1 gAllowDFSChannelRoam=1 +disable_scoring_for_roam=0 ############################################# # Offload related configurations ############################################# @@ -540,6 +542,8 @@ isP2pDeviceAddrAdministrated=0 gGoKeepAlivePeriod = 20 gApKeepAlivePeriod = 20 +gGoForce11NFor11AC=1 + ############################################# # SAP related configurations ############################################# From f0c0a9bc21584788b77820bb2bec106d1d4559e1 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Mon, 8 Jan 2018 18:41:36 +0000 Subject: [PATCH 13/53] Add display calibration info. Also, move to a nits-based autobrightness curve. Bug: 71706239 Test: Boot Walleye device, see we get a PhysicalBrightnessMapper in dumpsys display Change-Id: I687e43680d5001a2aeefb06d1caabaefcfa0f658 --- .../base/core/res/res/values/config.xml | 105 +++++++++++++----- 1 file changed, 75 insertions(+), 30 deletions(-) diff --git a/walleye/overlay/frameworks/base/core/res/res/values/config.xml b/walleye/overlay/frameworks/base/core/res/res/values/config.xml index 7a6e8d7..d981679 100644 --- a/walleye/overlay/frameworks/base/core/res/res/values/config.xml +++ b/walleye/overlay/frameworks/base/core/res/res/values/config.xml @@ -51,39 +51,84 @@ 4000 - - - 10 - 33 - 49 - 68 - 87 - 108 - 132 - 167 - 206 - 255 + + + 17.525 + 55.3 + 80.33 + 108.39 + 135.4 + 168 + 212.16 + 268.47 + 334.8 + 392.9 + + + + + 0 + 15 + 30 + 45 + 60 + 75 + 90 + 105 + 120 + 135 + 150 + 165 + 180 + 195 + 210 + 225 + 240 + 255 - - + + 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - + 26.11 + 50.5 + 74.17 + 96.89 + 118.3 + 139.8 + 162.9 + 189.8 + 217.4 + 240.4 + 265.3 + 288.7 + 316 + 340.8 + 357.9 + 376.2 + 392.9 + 600 From 5120e70b2d44568a8bb382d236339fd20bdab935 Mon Sep 17 00:00:00 2001 From: Siddharth Ray Date: Wed, 17 Jan 2018 15:16:29 -0800 Subject: [PATCH 14/53] Cellular/Wifi power profile for Walleye BUG:67213967 Change-Id: I22e42e626e5cb366b9f114950c70f0ff4bf6613c --- .../base/core/res/res/xml/power_profile.xml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 8cc203e..bf3ae4b 100644 --- a/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -180,6 +180,15 @@ 30 + + 1 + + 102 + + 250 + + 3800 + 50 @@ -194,4 +203,17 @@ 3 + + 1 + 25 + 50 + + 1 + 52 + 100 + 150 + 200 + + 3700 + From 6d56be23436c421c5e784ca08b1949e161ef09bb Mon Sep 17 00:00:00 2001 From: Nadav Bar Date: Sun, 7 Jan 2018 12:16:58 +0200 Subject: [PATCH 15/53] Add incall music to walleye mixer paths This change adds the paths for walleye for the incall music use case. The path is which is used is incall-music-uplink. This change was tested together with a set of additional changes to the audio framework and the HAL which introduces the ability to play pcm audio to the uplink stream. Bug: 69973354. Test: Tested manually. Change-Id: Ic7f3306ba9068daf4f455a627fddb273b04a73ea --- audio_platform_info_tavil.xml | 1 + mixer_paths_tavil.xml | 74 +++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml index f8c5f66..c8cf60c 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -75,6 +75,7 @@ + diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml index 9ed87b7..5471ae3 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -494,6 +494,7 @@ + @@ -2111,4 +2112,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 5ba00f6a26407ec8ea6f5a6e43fdfad4f1611c00 Mon Sep 17 00:00:00 2001 From: Marissa Wall Date: Mon, 22 Jan 2018 13:26:26 -0800 Subject: [PATCH 16/53] power profile: Update power profile cpu values Power profiles will now support active and cluster costs. Some power profile values have been renamed per b/67752294. Test: dump battery stats Change-Id: Iebfc012fdd6db9801a427d6839165f3af873def2 --- .../base/core/res/res/xml/power_profile.xml | 137 ++++++++++-------- 1 file changed, 74 insertions(+), 63 deletions(-) diff --git a/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 8cc203e..b3a0701 100644 --- a/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -32,13 +32,24 @@ - 6.815 + 6.815 - 0.386 + 0.386 + + + 17.757 + + + 6.478 + + 6.141 - + 300000 364800 441600 @@ -64,7 +75,7 @@ - + 300000 345600 422400 @@ -98,66 +109,66 @@ 2457600 - - - 94.160 - 93.476 - 94.298 - 94.855 - 95.562 - 96.226 - 97.122 - 97.846 - 98.628 - 100.261 - 101.152 - 102.414 - 103.788 - 105.495 - 107.019 - 107.988 - 109.419 - 112.277 - 115.216 - 120.171 - 121.103 - 127.612 + + + 3.685 + 3.598 + 3.621 + 4.202 + 4.935 + 5.633 + 6.216 + 6.710 + 7.557 + 8.687 + 9.882 + 10.950 + 12.075 + 12.875 + 14.424 + 15.653 + 17.345 + 18.710 + 21.587 + 25.430 + 27.165 + 31.671 - - - 100.694 - 101.776 - 104.376 - 107.662 - 110.020 - 112.200 - 115.311 - 117.869 - 120.536 - 124.278 - 126.533 - 128.559 - 133.988 - 136.235 - 141.534 - 145.820 - 150.525 - 156.475 - 164.219 - 169.669 - 179.833 - 196.902 - 204.774 - 222.625 - 227.947 - 251.520 - 266.381 - 282.240 - 288.020 - 295.238 - 294.655 + + + 10.722 + 11.520 + 14.105 + 16.680 + 18.946 + 21.265 + 23.432 + 26.019 + 28.856 + 31.085 + 33.615 + 35.760 + 40.608 + 43.284 + 47.347 + 52.231 + 57.225 + 63.138 + 69.251 + 76.449 + 84.710 + 102.551 + 107.115 + 129.689 + 135.832 + 164.674 + 180.279 + 197.024 + 204.511 + 211.886 + 212.147 From 0578d6262e51a2f7a31644d4e835b2f427c0eefb Mon Sep 17 00:00:00 2001 From: Kumar Anand Date: Mon, 22 Jan 2018 15:02:54 -0800 Subject: [PATCH 17/53] wifi: enable Softap ACS and 11ac on walleye Bug: 72228752 Bug: 72229084 Test: Wifi Regression Test Change-Id: I2c5de1743f81b3bb8759a96731a0a27fd1957b4d --- WCNSS_qcom_cfg.ini | 5 ----- .../overlay/frameworks/base/core/res/res/values/config.xml | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini index bc9c7d7..198cef5 100644 --- a/WCNSS_qcom_cfg.ini +++ b/WCNSS_qcom_cfg.ini @@ -542,8 +542,6 @@ isP2pDeviceAddrAdministrated=0 gGoKeepAlivePeriod = 20 gApKeepAlivePeriod = 20 -gGoForce11NFor11AC=1 - ############################################# # SAP related configurations ############################################# @@ -574,9 +572,6 @@ gAPChannelSelectEndChannel=11 # DFS Master Capability gEnableDFSMasterCap=1 -# Disable 11AC for hotspot -gSapForce11NFor11AC=1 - #Auto Shutdown Value in seconds. A value of 0 means Auto shutoff is disabled gAPAutoShutOff=0 diff --git a/walleye/overlay/frameworks/base/core/res/res/values/config.xml b/walleye/overlay/frameworks/base/core/res/res/values/config.xml index d981679..702f845 100644 --- a/walleye/overlay/frameworks/base/core/res/res/values/config.xml +++ b/walleye/overlay/frameworks/base/core/res/res/values/config.xml @@ -166,4 +166,11 @@ true + + + true + + + true + From 3721141909a0eb0ac4b0da339b7dd6653afaece8 Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Fri, 19 Jan 2018 10:55:22 -0800 Subject: [PATCH 18/53] Audio V4: Split system and vendor Audio.h audio.h and its dependencies (audio-effect.h, sound_trigger.h...) used to be shared between system and vendor code. This led to multiple problems: 1) Such sharing contradicts the Treble policy of strict independence of framework and vendor code. 2) When audio.h was changed, every vendor needed to update its code in the next release. This meant that audio*.h headers were mostly changed in backward compatible manner. Nevertheless, for P the HIDL interface and thus the audio.h interface are changed in backward incompatible way. (Some enum are becoming 64 bit long). 3) As the headers were common, some API used only by the framework needed to be visible to the vendors (mostly enum values). 4) Treble policy is to support at least one previous HAL version As a result the audio*.h headers are now duplicated, one set for the framework, and one for the vendor. Each set will evolve independently. After this split, the framework-only APIs will be removed from the vendor headers and vice versa. The split is implements as such: + for system code - NOT moving the libaudio_system_headers Eg: system/audio.h and system/audio_effects/effect_equalizer.h are still in system/media/audio - the legacy audio HAL API that were in libhardware headers are now in libaudiohal_legacy_headers Eg: hardware/audio.h and hardware/audio_effect.h are now in frameworks/av/media/libaudiohal/legacy/ + for vendor code - moving libaudio_system_headers and the legacy audio HAL API that were in libhardware_headers in android.hardware.audio.common.legacy@2.0 Note that those headers are now versioned, so migrating to a @4.0 HIDL HAL will mean changing the legacy dependency too. Eg: system/audio.h, system/audio-effect.h, hardware/audio.h are now in hardware/interfaces/audio/common/2.0/legacy - the legacy audio effect HAL API that was in libaudioeffects is now moved in android.hardware.audio.effect.legacy@2.0 Eg: audio_effects/effect*.h are now in hardware/interfaces/audio/effect/2.0/legacy - the legacy sound trigger HAL API that were in libhardware_headers is now moved in android.hardware.soundtrigger.legacy@2.0 Eg: hardware/sound_trigger.h is now in hardware/interfaces/audio/effect/2.0/legacy libaudioutil being used by both system and vendor, had to be renamed for system to libaudioutil_system. Vendor libs that now depend on the audio.h of a specific version and are not extensively referenced in non google code, append @2.0 to their name. Note that headers that are not expected to change in the 4.0 HAL are left in all-versions folder to avoid duplication. This is an implementation detail as the versioned libraries export the all-versions headers. Note that strict vendor-system separation is enforced by the build-system. The system headers are not available for vendor libs and vice-versa. Note that this patch is split between numerous git repository (>10), all the commits having the same Change-id for searchability. Note that audio_policy.h is no longer exposed to vendors as the legacy audio policy HAL API was never officially supported. As a result the audiopolicy stub implementation has been removed. Test: compile taimen-userdebug walleye-userdebug sailfish-userdebug marlin-userdebug gce_x86_phone-userdebug gce_x86_phone full-eng aosp_arm aosp_x86-eng Test: check that the emulator booted and played audio Test: full QA on sailfish-userdebug and taimen-userdebug Bug: 38184704 Change-Id: I950f4e0a55613d72e32eba31bd563cb5bafe2d1a Signed-off-by: Kevin Rocard --- voice_processing/Android.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/voice_processing/Android.mk b/voice_processing/Android.mk index 0ff33c7..75c9ee7 100644 --- a/voice_processing/Android.mk +++ b/voice_processing/Android.mk @@ -19,8 +19,9 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := voice_processing_descriptors.c -LOCAL_C_INCLUDES += $(call include-path-for, audio-effects) -LOCAL_HEADER_LIBRARIES := libhardware_headers +LOCAL_HEADER_LIBRARIES := \ + libhardware_headers \ + android.hardware.audio.effect.legacy@2.0 LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB) LOCAL_MODULE := libqcomvoiceprocessingdescriptors LOCAL_MODULE_RELATIVE_PATH := soundfx From acbf70717cc8fa790f54b650f8f414bcccaaadb5 Mon Sep 17 00:00:00 2001 From: Kumar Anand Date: Tue, 23 Jan 2018 13:23:55 -0800 Subject: [PATCH 19/53] wifi:walleye: Remove obsolete disable_scoring_for_roam disable_scoring_for_roam is renamed to enable_scoring_for_roam from the code and enabled by default. Hence, remove the obsolete ini item disable_scoring_for_roam. Bug: 71763975 Test: Wifi Regression Test Change-Id: I73365874a4f333aa026301f038fbc6e3890c4604 --- WCNSS_qcom_cfg.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini index 198cef5..bf2e158 100644 --- a/WCNSS_qcom_cfg.ini +++ b/WCNSS_qcom_cfg.ini @@ -404,7 +404,6 @@ gRoamOffloadEnabled=1 gAllowDFSChannelRoam=1 -disable_scoring_for_roam=0 ############################################# # Offload related configurations ############################################# From b1021d54836dc3a40e6c99357c302edb9dab822c Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Wed, 24 Jan 2018 06:13:02 +0000 Subject: [PATCH 20/53] Revert "Audio V4: Split system and vendor Audio.h" This reverts commit 3721141909a0eb0ac4b0da339b7dd6653afaece8. Reason for revert: Breaks the build of multiple devices Change-Id: I094b02b6b59baa107c532fc21fef945eaf2f4161 --- voice_processing/Android.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/voice_processing/Android.mk b/voice_processing/Android.mk index 75c9ee7..0ff33c7 100644 --- a/voice_processing/Android.mk +++ b/voice_processing/Android.mk @@ -19,9 +19,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := voice_processing_descriptors.c -LOCAL_HEADER_LIBRARIES := \ - libhardware_headers \ - android.hardware.audio.effect.legacy@2.0 +LOCAL_C_INCLUDES += $(call include-path-for, audio-effects) +LOCAL_HEADER_LIBRARIES := libhardware_headers LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB) LOCAL_MODULE := libqcomvoiceprocessingdescriptors LOCAL_MODULE_RELATIVE_PATH := soundfx From 91fb541476a42fcd36a8277bac8701be6158ae84 Mon Sep 17 00:00:00 2001 From: Kumar Anand Date: Wed, 31 Jan 2018 12:27:03 -0800 Subject: [PATCH 21/53] wifi: Optimize DP Tracing Reduce the DP (Data Path) Tracing events in order to not consume too much CPU cycles unnecessarily. New configuration helps saves 40% of cycles or 7.7MCycles/s Bug: 71766704 Change-Id: I128c62afe69229999ca911caad7fb17b59fa9413 --- WCNSS_qcom_cfg.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini index 198cef5..a62ef29 100644 --- a/WCNSS_qcom_cfg.ini +++ b/WCNSS_qcom_cfg.ini @@ -607,6 +607,8 @@ enable_11d_in_world_mode=1 gEnableLPRx=0 +gDptraceConfig="1,4,1,126" + END # Note: Configuration parser would not read anything past the END marker From 34bc67a72f5dca63bc1b9e41c292662354c38347 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 31 Jan 2018 20:12:46 -0800 Subject: [PATCH 22/53] Remove vendor.qti.qcril.am-V1.0-java.jar BUG:72705856 Change-Id: If4ff8fa8bfb4a2bd0cd6e7978a52eef72f1efc8c --- self-extractors/extract-lists.txt | 1 - self-extractors/qcom/staging/device-partial.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt index 2d67efc..9bb8d89 100644 --- a/self-extractors/extract-lists.txt +++ b/self-extractors/extract-lists.txt @@ -20,7 +20,6 @@ system/framework/embmslibrary.jar \ system/framework/qcrilhook.jar \ system/framework/rcsimssettings.jar \ - system/framework/vendor.qti.qcril.am-V1.0-java.jar \ system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so \ system/lib64/libaptX_encoder.so \ system/lib64/libaptXHD_encoder.so \ diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk index 37bcbdf..b7370ce 100644 --- a/self-extractors/qcom/staging/device-partial.mk +++ b/self-extractors/qcom/staging/device-partial.mk @@ -29,7 +29,6 @@ PRODUCT_COPY_FILES := \ vendor/qcom/walleye/proprietary/embmslibrary.jar:system/framework/embmslibrary.jar:qcom \ vendor/qcom/walleye/proprietary/rcsimssettings.jar:system/framework/rcsimssettings.jar:qcom \ vendor/qcom/walleye/proprietary/qcrilhook.jar:system/framework/qcrilhook.jar:qcom \ - vendor/qcom/walleye/proprietary/vendor.qti.qcril.am-V1.0-java.jar:system/framework/vendor.qti.qcril.am-V1.0-java.jar:qcom \ vendor/qcom/walleye/proprietary/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \ vendor/qcom/walleye/proprietary/lib64/libaptX_encoder.so:system/lib64/libaptX_encoder.so:qcom \ vendor/qcom/walleye/proprietary/lib64/libaptXHD_encoder.so:system/lib64/libaptXHD_encoder.so:qcom \ From b17e1e58f9428a7fcdcc3fff589bef0efe3071f8 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Mon, 12 Feb 2018 21:55:51 +0000 Subject: [PATCH 23/53] Reduce Walleye's min brightness. Walleye used to have a dark configuration value of 1, but that got removed when we changed how the slider worked. Unfortunately, the min value was never set to what the dark value used to be, leaving walleye's minimum brightness needlessly high. Change-Id: I7e1ee480a00de6180277672c0f4c379f1e66d306 Fixes: 73190431 Test: flash, dumpsys display, see new min value --- walleye/overlay/frameworks/base/core/res/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/walleye/overlay/frameworks/base/core/res/res/values/config.xml b/walleye/overlay/frameworks/base/core/res/res/values/config.xml index 702f845..797c603 100644 --- a/walleye/overlay/frameworks/base/core/res/res/values/config.xml +++ b/walleye/overlay/frameworks/base/core/res/res/values/config.xml @@ -145,7 +145,7 @@ - 4 + 1 From 8bbff6ea65bc6c02951c83bba267532145d8478f Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Wed, 28 Feb 2018 15:09:37 -0800 Subject: [PATCH 24/53] Disable wake-up animation on walleye Test: make, flashall, pres power button Change-Id: Ie01187c8fdaeae11d82476f324a98aab385da9ac --- walleye/overlay/frameworks/base/core/res/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/walleye/overlay/frameworks/base/core/res/res/values/config.xml b/walleye/overlay/frameworks/base/core/res/res/values/config.xml index 797c603..1172f52 100644 --- a/walleye/overlay/frameworks/base/core/res/res/values/config.xml +++ b/walleye/overlay/frameworks/base/core/res/res/values/config.xml @@ -161,7 +161,7 @@ true - false + true From 2c635657f94abddae97242de876544a0c50954e0 Mon Sep 17 00:00:00 2001 From: Phil Burk Date: Mon, 19 Mar 2018 14:30:04 -0700 Subject: [PATCH 25/53] aaudio: add MMAP mode for handset on Walleye This fixes a bug that prevented starting an AAudio MMAP stream running on the earphone speaker. Bug: b/75304145 Test: adb shell write_sine_callback -m3 -d2 -pl Change-Id: I0eeaf7c93288893fafa5a4e207623d5b5162776e --- mixer_paths_tavil.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml index 5471ae3..52da9ee 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -988,6 +988,10 @@ + + + + From 37b39f3affb9176c2215153cd2cf9a1cfc6e093c Mon Sep 17 00:00:00 2001 From: Siddharth Ray Date: Tue, 20 Mar 2018 16:24:49 -0700 Subject: [PATCH 26/53] Power profile for W BUG:72383423 Change-Id: Ia1c6b73765c620b91572728261f17fecc0c909db --- .../base/core/res/res/xml/power_profile.xml | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 8385ac5..c0ccfb4 100644 --- a/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -194,11 +194,11 @@ 1 - 102 + 125 - 250 + 350 - 3800 + 3700 50 @@ -215,16 +215,23 @@ - 1 - 25 - 50 + 0 + 110 + 128 1 - 52 + 5 + 26 100 - 150 - 200 + 249 3700 + + + 32 + 4 + + 3700 + From 399f7febf3429ef481b3f02407fab6ba056820c8 Mon Sep 17 00:00:00 2001 From: Marissa Wall Date: Wed, 21 Mar 2018 09:47:41 -0700 Subject: [PATCH 27/53] power profile: Update walleye power profile Power profiles now support ambient, video. Remove power.none because it is never used by batterystats. Remove the radio values that are never used because modem.controller.* are present. Update audio. Fixes: 63738468 b/70531798 b/74125473 Test: Boot phone and dump BatteryStats Change-Id: I7df6a465f56f08130410f051953f690106763b59 --- .../base/core/res/res/xml/power_profile.xml | 39 +++++++------------ 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml index c0ccfb4..f624e60 100644 --- a/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -17,10 +17,7 @@ */ --> - - - - 0 + 2700 @@ -171,6 +168,9 @@ 212.147 + + 23.69 + 131.397 895.907 - - 55.714 + + 21.29 + + 74.758 - - 30 - - + 1 125 350 - + 3700 - - 50 - - 5 - - - 6 - 5 - 4 - 3 - 3 - - 0 + 110 + 128 + 1 5 @@ -225,6 +213,7 @@ 100 249 + 3700 From 7006aa251e0302a9014fa394fd96d8e7dcc5440e Mon Sep 17 00:00:00 2001 From: Marissa Wall Date: Wed, 21 Mar 2018 09:50:14 -0700 Subject: [PATCH 28/53] power profile: Add walleye bluetooth Add walleye bluetooth values. Fixes: 63738468 b/74126906 Test: Boot phone and dump BatteryStats Change-Id: I0210165418d042a2d29e02b9689c85ea35965fc3 --- .../frameworks/base/core/res/res/xml/power_profile.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml index f624e60..b58f2de 100644 --- a/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -223,4 +223,13 @@ 3700 + + 0.01 + + 9 + + 7 + + 3300 + From 94f9e510b11d5bb33705c6cb565987fa5de77696 Mon Sep 17 00:00:00 2001 From: jiabin Date: Mon, 19 Mar 2018 18:25:35 -0700 Subject: [PATCH 29/53] Fake microphones information in xml. Bug: 64038649 Bug: 75041465 Test: Manual Testing and Cts test Change-Id: I1b91ac0992e6d3ec5b5c573d849a203311d9f039 --- audio_platform_info_tavil.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml index c8cf60c..51d7175 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -119,5 +119,14 @@ + + + + + From 8d97cbed3dede29014d2e505dd94503f0e1c51b1 Mon Sep 17 00:00:00 2001 From: Qingxi Li Date: Wed, 21 Mar 2018 15:34:27 -0700 Subject: [PATCH 30/53] Add a device flag to decide how eSIM UI shown Add a device flag to decide whether by default, eSIM UI, including the UI in settings, under Mobile network > Carrier, and eSIM setup flow in Steup Wizard flow. Bug: 74771471 Test: E2E Change-Id: I7b29a7a126273bc19d76bef77f667a468ee11dc8 --- device-common.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device-common.mk b/device-common.mk index 74ed3af..ba48390 100644 --- a/device-common.mk +++ b/device-common.mk @@ -28,6 +28,8 @@ PRODUCT_PROPERTY_OVERRIDES += vendor.audio.adm.buffering.ms=3 PRODUCT_PROPERTY_OVERRIDES += audio_hal.period_multiplier=2 PRODUCT_PROPERTY_OVERRIDES += af.fast_track_multiplier=1 +# Whether by default, the eSIM system UI, including that in SUW and Settings, will be shown. +PRODUCT_SYSTEM_DEFAULT_PROPERTIES += esim.enable_esim_system_ui_by_default=false # Pro audio feature PRODUCT_COPY_FILES += \ From 05b4cbe47cb03b66579ec09d54c68bba313ddbf8 Mon Sep 17 00:00:00 2001 From: Thierry Strudel Date: Mon, 26 Mar 2018 17:27:30 -0700 Subject: [PATCH 31/53] init-common: map sys.retaildemo.enabled to persist.vendor.charge.* Bug: 73647497 Change-Id: Id317f390da648b935819e25342725a4663ee5841 Signed-off-by: Thierry Strudel --- init-common.rc | 12 ++++++++++++ init.common.usb.rc | 8 -------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/init-common.rc b/init-common.rc index 5ce4f69..8b4df84 100644 --- a/init-common.rc +++ b/init-common.rc @@ -44,3 +44,15 @@ on init && property:ro.boot.revision=MP1 on boot && property:ro.build.type=userdebug write /sys/class/uio/uio1/device/rtel/rtel 1 + +# charger driver exposes now finer grain control, map demo mode to those properties +# demo mode can only be exit wipping data which will also reset the persist properties +on property:sys.retaildemo.enabled=1 + setprop persist.vendor.charge.stop.level 35 + setprop persist.vendor.charge.start.level 30 + +on property:persist.vendor.charge.stop.level=* + write /sys/module/htc_battery/parameters/charge_stop_level ${persist.vendor.charge.stop.level} + +on property:persist.vendor.charge.start.level=* + write /sys/module/htc_battery/parameters/charge_start_level ${persist.vendor.charge.start.level} diff --git a/init.common.usb.rc b/init.common.usb.rc index 629f0f6..19e93d1 100644 --- a/init.common.usb.rc +++ b/init.common.usb.rc @@ -3,11 +3,3 @@ import /vendor/etc/init/hw/init.wahoo.usb.rc on boot && property:ro.bootmode=usbradio && property:persist.sys.usb.usbradio.config=* setprop sys.usb.config "none" setprop sys.usb.config ${persist.sys.usb.usbradio.config} - -# battery driver settings for the retail demo environment where -# the device will be perpertually plugged in to a power source -on property:sys.retaildemo.enabled=1 - write /sys/module/htc_battery/parameters/full_level_dis_chg 35 - -on property:sys.retaildemo.enabled=0 - write /sys/module/htc_battery/parameters/full_level_dis_chg 100 From 7214252bae8569510af500dac46b6bb927e32d5b Mon Sep 17 00:00:00 2001 From: Kumar Anand Date: Wed, 14 Mar 2018 14:42:59 -0700 Subject: [PATCH 32/53] wifi: update configuration (ini) file gAP11ACOverride=0 gEnableDTIMSelectionDiversity=3 MAWCEnabled=0 mawc_roam_enabled=0 mawc_nlo_enabled=0 Bug: 73786667 Test: Wifi Regression Test Change-Id: I4b44584f6b9563f8610f39195777221af6953616 --- WCNSS_qcom_cfg.ini | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini index 6973581..452beaf 100644 --- a/WCNSS_qcom_cfg.ini +++ b/WCNSS_qcom_cfg.ini @@ -606,7 +606,28 @@ enable_11d_in_world_mode=1 gEnableLPRx=0 -gDptraceConfig="1,4,1,126" +gDptraceConfig=1,4,1,126 + +gAP11ACOverride=0 + +#Enable/Disable chain selection optimization for one chain dtim +#Min: 0 +#MAX: 30 +gEnableDTIMSelectionDiversity=3 + +############################################# +# MAWC related configurations +############################################# + +# MAWCEnabled - Enable/Disable Motion Aided Wireless Connectivity Global +MAWCEnabled=0 + +# mawc_roam_enabled - Enable/Disable MAWC during roaming +mawc_roam_enabled=0 + +# Enable/Disable the Motion Aided Wireless Connectivity +# based NLO using this parameter +mawc_nlo_enabled=0 END From ac3cdba4d83e1bcafec7efb75991027c3e4a7ab8 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Mon, 26 Mar 2018 17:07:55 -0700 Subject: [PATCH 33/53] WLAN: MSM8998: Add ini param for rtt mac randomization Add ini param to enable/disable rtt mac randomization. Change-Id: I92e101b6d933a5ed37069185eacf75cc9a672e9d CRs-Fixed: 2210299 Bug: 76086842 Signed-off-by: Srinivas Girigowda --- WCNSS_qcom_cfg.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini index 452beaf..185e4c2 100644 --- a/WCNSS_qcom_cfg.ini +++ b/WCNSS_qcom_cfg.ini @@ -629,6 +629,9 @@ mawc_roam_enabled=0 # based NLO using this parameter mawc_nlo_enabled=0 +# Enable/Disable rtt sta mac randomization +enable_rtt_mac_randomization=1 + END # Note: Configuration parser would not read anything past the END marker From d438d71c0dc51267a001953f6a423ab862ff5e92 Mon Sep 17 00:00:00 2001 From: Ahmed ElArabawy Date: Fri, 9 Feb 2018 18:03:14 -0800 Subject: [PATCH 34/53] WiFi: Switch wifi driver in wahoo into DLKM Current implementation in wahoo is to build the WiFi driver as a static module (part of the kernel image) This commit uses a dynamic linkable Kernel Module which is loaded at init, and never unloads Bug: 73177354 Test: Manual test Change-Id: If605422dfda62ef0bf52b09f519fb9091b5d9ddb Signed-off-by: Ahmed ElArabawy --- device-common.mk | 24 ++++++++++++++++-------- init.insmod.cfg | 1 + 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/device-common.mk b/device-common.mk index ba48390..35126e3 100644 --- a/device-common.mk +++ b/device-common.mk @@ -85,55 +85,63 @@ BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/gcc/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/gcc/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/gcc/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/gcc/htc_battery.ko + device/google/wahoo-kernel/gcc/htc_battery.ko \ + device/google/wahoo-kernel/gcc/wlan.ko else ifeq (,$(filter-out walleye_kasan, $(TARGET_PRODUCT))) # if TARGET_PRODUCT == *_kasan BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/kasan/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/kasan/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/kasan/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/kasan/htc_battery.ko + device/google/wahoo-kernel/kasan/htc_battery.ko \ + device/google/wahoo-kernel/kasan/wlan.ko else ifeq (,$(filter-out walleye_kcfi, $(TARGET_PRODUCT))) # if TARGET_PRODUCT == *_kcfi BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/kcfi/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/kcfi/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/kcfi/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/kcfi/htc_battery.ko + device/google/wahoo-kernel/kcfi/htc_battery.ko \ + device/google/wahoo-kernel/kcfi/wlan.ko else ifeq (,$(filter-out walleye_kernel_debug_memory, $(TARGET_PRODUCT))) # if TARGET == walleye_kernel_debug_memory BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/debug_memory/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/debug_memory/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/debug_memory/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/debug_memory/htc_battery.ko + device/google/wahoo-kernel/debug_memory/htc_battery.ko \ + device/google/wahoo-kernel/debug_memory/wlan.ko else ifeq (,$(filter-out walleye_kernel_debug_locking, $(TARGET_PRODUCT))) # if TARGET == walleye_kernel_debug_locking BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/debug_locking/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/debug_locking/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/debug_locking/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/debug_locking/htc_battery.ko + device/google/wahoo-kernel/debug_locking/htc_battery.ko \ + device/google/wahoo-kernel/debug_locking/wlan.ko else ifeq (,$(filter-out walleye_kernel_debug_hang, $(TARGET_PRODUCT))) # if TARGET == walleye_kernel_debug_hang BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/debug_hang/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/debug_hang/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/debug_hang/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/debug_hang/htc_battery.ko + device/google/wahoo-kernel/debug_hang/htc_battery.ko \ + device/google/wahoo-kernel/debug_hang/wlan.ko else ifeq (,$(filter-out walleye_kernel_debug_api, $(TARGET_PRODUCT))) # if TARGET == walleye_kernel_debug_api BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/debug_api/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/debug_api/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/debug_api/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/debug_api/htc_battery.ko + device/google/wahoo-kernel/debug_api/htc_battery.ko \ + device/google/wahoo-kernel/debug_api/wlan.ko else BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/htc_battery.ko + device/google/wahoo-kernel/htc_battery.ko \ + device/google/wahoo-kernel/wlan.ko endif PRODUCT_COPY_FILES += \ diff --git a/init.insmod.cfg b/init.insmod.cfg index 6d2b325..082948c 100644 --- a/init.insmod.cfg +++ b/init.insmod.cfg @@ -2,3 +2,4 @@ insmod /vendor/lib/modules/synaptics_dsx_core_htc.ko insmod /vendor/lib/modules/synaptics_dsx_fw_update_htc.ko insmod /vendor/lib/modules/synaptics_dsx_rmi_dev_htc.ko insmod /vendor/lib/modules/htc_battery.ko +insmod /vendor/lib/modules/wlan.ko From 72d81355443bc873de44036d704f02c5b2660c5d Mon Sep 17 00:00:00 2001 From: Ruchi Kandoi Date: Fri, 30 Mar 2018 14:51:56 -0700 Subject: [PATCH 35/53] libnfc-nxp.conf changes for NFC 1.1 Test: Nfc enabled/disabled; tag reading Bug: 75980364 Change-Id: I8232d391d20181d5567e44a87f1ae72012c5646d --- nfc/libnfc-nxp.muskie.conf | 305 ++++--------------------------------- 1 file changed, 30 insertions(+), 275 deletions(-) diff --git a/nfc/libnfc-nxp.muskie.conf b/nfc/libnfc-nxp.muskie.conf index 973dee6..d1e530e 100644 --- a/nfc/libnfc-nxp.muskie.conf +++ b/nfc/libnfc-nxp.muskie.conf @@ -14,6 +14,7 @@ NXPLOG_NCIX_LOGLEVEL=0x01 NXPLOG_NCIR_LOGLEVEL=0x01 NXPLOG_FWDNLD_LOGLEVEL=0x01 NXPLOG_TML_LOGLEVEL=0x01 +NFC_DEBUG_ENABLED=0x01 ############################################################################### # Nfc Device Node name @@ -24,12 +25,10 @@ NXP_NFC_DEV_NODE="/dev/nq-nci" MIFARE_READER_ENABLE=0x01 ############################################################################### -# Vzw Feature enable -VZW_FEATURE_ENABLE=0x01 - -############################################################################### -# File name for Firmware -NXP_FW_NAME="libpn553_fw.so" +# Firmware file type +#.so file 0x01 +#.bin file 0x02 +NXP_FW_TYPE=0x01 ############################################################################### # System clock source selection configuration @@ -61,16 +60,6 @@ NXP_ACT_PROP_EXTN={2F, 02, 00} # NFC forum profile settings NXP_NFC_PROFILE_EXTN={20, 02, 05, 01, A0, 44, 01, 00} -############################################################################### -# NFCC Configuration Control -# Allow NFCC to manage RF Config 0x01 -# Don't allow NFCC to manage RF Config 0x00 -NXP_NFC_MERGE_RF_PARAMS={20, 02, 04, 01, 85, 01, 01} - -############################################################################### -# Standby enable settings -#NXP_CORE_STANDBY={2F, 00, 01, 01} - ############################################################################### # NXP TVDD configurations settings # Allow NFCC to configure External TVDD, two configurations (1 and 2) supported, @@ -129,12 +118,6 @@ NXP_RF_CONF_BLK_3={ #NXP_RF_CONF_BLK_6={ #} -############################################################################### -# Set configuration optimization decision setting -# Enable = 0x01 -# Disable = 0x00 -NXP_SET_CONFIG_ALWAYS=0x00 - ############################################################################### # Core configuration extensions # It includes @@ -198,134 +181,21 @@ NXP_CORE_CONF={ 20, 02, 31, 0F, 18, 01, 01 } -############################################################################### -# Mifare Classic Key settings -#NXP_CORE_MFCKEY_SETTING={20, 02, 25,04, A0, 51, 06, A0, A1, A2, A3, A4, A5, -# A0, 52, 06, D3, F7, D3, F7, D3, F7, -# A0, 53, 06, FF, FF, FF, FF, FF, FF, -# A0, 54, 06, 00, 00, 00, 00, 00, 00} - -############################################################################### -# Default SE Options -# No secure element 0x00 -# eSE 0x01 -# UICC 0x02 -# UICC2 0x04 -NXP_DEFAULT_SE=0x07 - ############################################################################### #Enable SWP full power mode when phone is power off NXP_SWP_FULL_PWR_ON=0x00 ############################################################################### -#### Select the CHIP #### -#PN547C2 0x01 -#PN65T 0x02 -#PN548AD 0x03 -#PN66T 0x04 -#PN551 0x05 -#PN67T 0x06 -#PN553 0x07 -#PN80T 0x08 -NXP_NFC_CHIP=0x08 - -############################################################################### -# CE when Screen state is locked -# This setting is for DEFAULT_AID_ROUTE, -# DEFAULT_DESFIRE_ROUTE and DEFAULT_MIFARE_CLT_ROUTE -# Disable 0x00 -# Enable 0x01 -NXP_CE_ROUTE_STRICT_DISABLE=0x01 - -############################################################################### -#Timeout in secs to get NFCEE Discover notification -NXP_DEFAULT_NFCEE_DISC_TIMEOUT=20 - -############################################################################### -NXP_DEFAULT_NFCEE_TIMEOUT=20 - -############################################################################### -#Timeout in secs -NXP_SWP_RD_START_TIMEOUT=0x0A - -############################################################################### -#Timeout in secs -NXP_SWP_RD_TAG_OP_TIMEOUT=0x01 - -############################################################################### -#Set the default AID route Location : -#This settings will be used when application does not set this parameter +#Set the default Felica T3T System Code OffHost route Location : # host 0x00 # eSE 0x01 # UICC 0x02 # UICC2 0x03 -DEFAULT_AID_ROUTE=0x00 +DEFAULT_SYS_CODE_ROUTE=0x00 ############################################################################### -#Set the Mifare Desfire route Location : -#This settings will be used when application does not set this parameter -# host 0x00 -# eSE 0x01 -# UICC 0x02 -# UICC2 0x03 -DEFAULT_DESFIRE_ROUTE=0x02 - -############################################################################### -#Set the Mifare CLT route Location : -#This settings will be used when application does not set this parameter -# host 0x00 -# eSE 0x01 -# UICC 0x02 -# UICC2 0x03 -DEFAULT_MIFARE_CLT_ROUTE=0x02 - -############################################################################### -#Set the Felica CLT route Location : -#This settings will be used when application does not set this parameter -# eSE 0x01 -# UICC 0x02 -# UICC2 0x03 -DEFAULT_FELICA_CLT_ROUTE=0x01 - -############################################################################### -#Set the default AID Power state : -#This settings will be used when application does not set this parameter -# bit pos 0 = Switch On -# bit pos 1 = Switch Off -# bit pos 2 = Battery Off -# bit pos 3 = Screen Lock -# bit pos 4 = Screen Off -DEFAULT_AID_PWR_STATE=0x19 - -############################################################################### -#Set the Mifare Desfire Power state : -#This settings will be used when application does not set this parameter -# bit pos 0 = Switch On -# bit pos 1 = Switch Off -# bit pos 2 = Battery Off -# bit pos 3 = Screen Lock -# bit pos 4 = Screen Off -DEFAULT_DESFIRE_PWR_STATE=0x1B - -############################################################################### -#Set the Mifare CLT Power state : -#This settings will be used when application does not set this parameter -# bit pos 0 = Switch On -# bit pos 1 = Switch Off -# bit pos 2 = Battery Off -# bit pos 3 = Screen Lock -# bit pos 4 = Screen Off -DEFAULT_MIFARE_CLT_PWR_STATE=0x1B - -############################################################################### -#Set the Felica CLT Power state : -#This settings will be used when application does not set this parameter -# bit pos 0 = Switch On -# bit pos 1 = Switch Off -# bit pos 2 = Battery Off -# bit pos 3 = Screen Lock -# bit pos 4 = Screen Off -DEFAULT_FELICA_CLT_PWR_STATE=0x1B +#Set the default Felica T3T System Code : +DEFAULT_SYS_CODE={FE,FF} ############################################################################### # AID Matching platform options @@ -333,18 +203,6 @@ DEFAULT_FELICA_CLT_PWR_STATE=0x1B # AID_MATCHING_K 0x02 AID_MATCHING_PLATFORM=0x01 -############################################################################### -# P61 interface options -# NFC 0x01 -# SPI 0x02 -NXP_P61_LS_DEFAULT_INTERFACE=0x01 - -############################################################################### -# P61 LTSM interface options -# NFC 0x01 -# SPI 0x02 -NXP_P61_LTSM_DEFAULT_INTERFACE=0x01 - ############################################################################### #CHINA_TIANJIN_RF_SETTING #Enable 0x01 @@ -359,133 +217,30 @@ NXP_CHINA_TIANJIN_RF_ENABLED=0x01 # 10 millisecond timeout 0x0A NXP_SWP_SWITCH_TIMEOUT=0x0A -############################################################################### -# P61 interface options for JCOP Download -# NFC 0x01 -# SPI 0x02 -NXP_P61_JCOP_DEFAULT_INTERFACE=0x01 +############################################################################## +# Extended APDU length for ISO_DEP +ISO_DEP_MAX_TRANSCEIVE=0xFEFF ############################################################################### -# P61 JCOP OS download options -# FRAMEWORK API BY APPLICATION 0x00 -# AT BOOT_TIME 0x01 -NXP_JCOPDL_AT_BOOT_ENABLE=0x00 +# Vendor Specific Proprietary Protocol & Discovery Configuration +# Set to 0xFF if unsupported +# byte[0] NCI_PROTOCOL_18092_ACTIVE +# byte[1] NCI_PROTOCOL_B_PRIME +# byte[2] NCI_PROTOCOL_DUAL +# byte[3] NCI_PROTOCOL_15693 +# byte[4] NCI_PROTOCOL_KOVIO +# byte[5] NCI_PROTOCOL_MIFARE +# byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO +# byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME +# byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME +NFA_PROPRIETARY_CFG={05, FF, FF, 06, 81, 80, 70, FF, FF} ############################################################################### -# Loader service version -# NFC service checks for LS version 2.0 or 2.1 -# LS2.0 0x20 -# LS2.1 0x21 -# LS2.2 0x22 -# AT NFC service intialization -NXP_LOADER_SERVICE_VERSION=0x22 - -############################################################################### -#Timeout value in milliseconds for NFCC standby mode.The range is between 5000 -#msec to 20000 msec and zero is to disable. -NXP_NFCC_STANDBY_TIMEOUT=20000 - -############################################################################### -#Dynamic RSSI feature enable -# Disable 0x00 -# Enable 0x01 -NXP_AGC_DEBUG_ENABLE=0x00 - -############################################################################### -#Virtual Mode ESE and Wired Mode ongoing delay Wired Mode -# For Technology routing to ESE Technology Mask = 4 -# For ISO-DEP Protocol routing to ESE Mask = 2 -# It can also take TECH|PROTO = 6 -# To ignore the delay set mask to = 0 -NXP_ESE_WIRED_PRT_MASK=0x00 - -############################################################################### -#Virtual Mode UICC and Wired Mode ongoing delay Wired Mode -#For Technology routing to UICC Technology Mask = 4 -#For ISO-DEP Protocol routing to UICC set Mask = 2 -#For Select AID Routing to UICC set Mask = 1 -#It can also take values TECH|PROTO|SELECT_AID = 7 , 6 , 5 ,3 .To ignore delay -#set mask = 0 -NXP_UICC_WIRED_PRT_MASK=0x00 - -################################################################################ -#RF field true delay Wired Mode -# delay wired mode = 1 -# allow wired mode = 0 -NXP_WIRED_MODE_RF_FIELD_ENABLE=0x00 - -############################################################################### -#Config to allow adding aids -#NFC on/off is required after this config -#1 = enabling adding aid to NFCC routing table. -#0 = disabling adding aid to NFCC routing table. -NXP_ENABLE_ADD_AID=0x01 - -############################################################################### -# JCOP-3.3 continuous process timeout in msec and value should be in Hexadecimal -# JCOP CP TIMEOUT -NXP_CP_TIMEOUT={00, 77} - -############################################################################### -# Enable/Disable checking default proto SE Id -# Disable 0x00 -# Enable 0x01 -NXP_CHECK_DEFAULT_PROTO_SE_ID=0x01 - -############################################################################### -#NXP_CN_TRANSIT_BLK_NUM_CHECK_ENABLE -#Enable/Disable block number checks for china transit use case -#Enable 0x01 -#Disable 0x00 -NXP_CN_TRANSIT_BLK_NUM_CHECK_ENABLE=0x01 - -############################################################################### -# Wired mode resume timeout vaule in wired mode resume feature enable -# DWP resume time out in ms( 4 bytes hex value and LSB first) -#example 1000 = 0x03E8 -#exmaple 2000 = 0x07D0 -#example 500 = 0x01F4 -NXP_WIREDMODE_RESUME_TIMEOUT={E8,03,00,00} -############################################################################### -# Power to eSE is controlled by DH or PMU depending on following configurations -#define DH_PWR_CONTROL 1 -#define PMU_PWR_CONTROL 2 -NXP_ESE_POWER_DH_CONTROL=1 - -############################################################################### -# Timeout value in milliseconds for wired mode resume after RF field event timeout -NXP_NFCC_RF_FIELD_EVENT_TIMEOUT=3000 - -############################################################################### -# NXP PMU Support configuration is sent if PMU_PWR_CONTROL is configured -# External PMU available in phone ON and phone OFF case if NXP_ESE_POWER_EXT_PMU=1 -# External PMU available only in phone ON case if NXP_ESE_POWER_EXT_PMU=2 -NXP_ESE_POWER_EXT_PMU=2 - -############################################################################### -# Whether to allow wired mode in desfire and mifare CLT -# Disable 0x00 -# Enable 0x01 -NXP_ALLOW_WIRED_IN_MIFARE_DESFIRE_CLT=0x00 - -############################################################################### -# Restrict routing to first matched rule only. -# Blacklist enable 0x01 -# Blacklist disable 0x00 -NXP_PROP_BLACKLIST_ROUTING=0x00 - -############################################################################### -# Send DWP interface reset command as part of SE open -# Disable 0x00 -# Enable 0x01 -NXP_DWP_INTF_RESET_ENABLE=0x01 - -############################################################################### -# Timeout value in milliseconds for JCOP OS download to complete -OS_DOWNLOAD_TIMEOUT_VALUE=60000 - -############################################################################### -# Timeout value in milliseconds to send response for Felica command received -NXP_HCEF_CMD_RSP_TIMEOUT_VALUE=5000 +# Choose the presence-check algorithm for type-4 tag. If not defined, the default value is 1. +# 0 NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm +# 1 NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block +# 2 NFA_RW_PRES_CHK_ISO_DEP_NAK; Type - 4 tag protocol iso-dep nak presence check +# command is sent waiting for rsp and ntf. +PRESENCE_CHECK_ALGORITHM=2 ############################################################################### From cc7d3becb07d142bad092d1596e0e0c726f3aa6c Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Mon, 2 Apr 2018 15:42:22 -0700 Subject: [PATCH 36/53] Volume curves: alarm and a11y can't be muted Bug: 72403580 Bug: 74985293 Test: try to mute alarms through UI and fail Change-Id: I5f0cd3f8d0afffe48ad894a905ae2d6caa852d62 --- audio_policy_volumes.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/audio_policy_volumes.xml b/audio_policy_volumes.xml index dbeb268..a5448b5 100644 --- a/audio_policy_volumes.xml +++ b/audio_policy_volumes.xml @@ -93,17 +93,17 @@ volume index from 0 to 100. + ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/> - 1,-4680 + 0,-4680 42,-2070 85,-540 100,0 + ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/> + ref="DEFAULT_NON_MUTABLE_EXT_VOLUME_CURVE"/> @@ -169,13 +169,13 @@ volume index from 0 to 100. + ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/> + ref="DEFAULT_NON_MUTABLE_SPEAKER_VOLUME_CURVE"/> + ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/> + ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/> Date: Tue, 3 Apr 2018 17:00:39 +0100 Subject: [PATCH 37/53] Update brightness curves for walleye Update brightness curves using curves from https://cs.corp.google.com/piper///depot/google3/java/com/google/android/libraries/smartbattery/brightness/model/DeviceCurves.java Sampled at integer log values from 0 to 5000. Bug: 74386763 Test: Manual, flash device, adb shell dumpsys display and check brightness config. Test: try phone near window and in dark area check brightness is reasonable. Test: Push zebedee curve, check curve is the same as built in version. Change-Id: I7f91535d755692682a19b02887393d6041a3e798 --- .../base/core/res/res/values/config.xml | 54 ++++++++++++------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/walleye/overlay/frameworks/base/core/res/res/values/config.xml b/walleye/overlay/frameworks/base/core/res/res/values/config.xml index 1172f52..db31b95 100644 --- a/walleye/overlay/frameworks/base/core/res/res/values/config.xml +++ b/walleye/overlay/frameworks/base/core/res/res/values/config.xml @@ -40,15 +40,24 @@ Must be overridden in platform specific overlays --> - 5 + 1 + 2 + 3 + 4 + 8 + 12 20 - 40 - 100 - 325 - 600 - 1250 - 2200 - 4000 + 33 + 55 + 90 + 148 + 245 + 403 + 665 + 1097 + 1808 + 2981 + 5000 - 17.525 - 55.3 - 80.33 - 108.39 - 135.4 - 168 - 212.16 - 268.47 - 334.8 - 392.9 + 14.22825 + 17.92821 + 21.0392 + 23.454172 + 25.448406 + 31.200361 + 35.231995 + 41.076897 + 47.72592 + 55.562805 + 64.97754 + 77.0652 + 94.4501 + 117.607216 + 149.78299 + 197.58708 + 254.74942 + 320.71716 + 395.74274 + + 8 + + true From 46f5b6d753b6fa9c18f3ca8634e45d892adba1cf Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Wed, 18 Apr 2018 10:00:46 -0700 Subject: [PATCH 42/53] audio mixer paths: add missing init values for mmap path Bug: 65378324 Test: repro steps in bug Test: CTS test AAudioTests Change-Id: I46606b8cd90fe3a1cec50d510f049965dc5a8a32 --- mixer_paths_tavil.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml index 52da9ee..007ac6e 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -201,7 +201,6 @@ - @@ -614,6 +613,13 @@ + + + + + + + From 90482ed6df4a99c0c3f509cd0f18e3816c2ef82a Mon Sep 17 00:00:00 2001 From: rago Date: Thu, 19 Apr 2018 15:32:33 -0700 Subject: [PATCH 43/53] Dynamics Processing Effect Dynamics Processing configuration Bug: 64161702 Bug: 38266419 Test: manual and CTS testing Change-Id: If99357ea1f703ebbc5f8157995eead3758f8e001 --- audio_effects.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/audio_effects.xml b/audio_effects.xml index 704e53c..ea4a900 100644 --- a/audio_effects.xml +++ b/audio_effects.xml @@ -6,6 +6,7 @@ + @@ -55,6 +56,7 @@ + From 415d8ad6e9fae9d96e06f4abe6e122b95f932ee2 Mon Sep 17 00:00:00 2001 From: jiabin Date: Thu, 3 May 2018 14:03:30 -0700 Subject: [PATCH 44/53] Add actual data for microphone characteristics. Bug: 75041465 Test: run cts Change-Id: I427064114b40257ca46f0bcd933da6ea32772a78 --- audio_platform_info_tavil.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml index 51d7175..45ef307 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -119,14 +119,17 @@ - + group="0" index_in_the_group="0" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="256" + frequencies="99.61 102.54 105.47 108.40 111.33 114.26 117.19 120.12 123.05 125.98 128.91 131.84 134.77 137.70 140.63 143.55 146.48 149.41 152.34 155.27 158.20 161.13 164.06 166.99 169.92 172.85 175.78 178.71 181.64 184.57 187.50 190.43 193.36 199.22 202.15 205.08 210.94 213.87 219.73 222.66 228.52 234.38 237.30 243.16 249.02 254.88 257.81 263.67 269.53 275.39 281.25 287.11 292.97 298.83 307.62 313.48 319.34 325.20 333.98 339.84 345.70 354.49 360.35 369.14 377.93 383.79 392.58 401.37 410.16 418.95 427.73 436.52 445.31 454.10 462.89 474.61 483.40 495.12 503.91 515.63 524.41 536.13 547.85 559.57 571.29 583.01 594.73 609.38 621.09 632.81 647.46 662.11 673.83 688.48 703.13 717.77 732.42 750.00 764.65 779.30 796.88 814.45 832.03 846.68 867.19 884.77 902.34 922.85 940.43 960.94 981.45 1001.95 1022.46 1042.97 1066.41 1089.84 1110.35 1133.79 1157.23 1183.59 1207.03 1233.40 1259.77 1286.13 1312.50 1338.87 1368.16 1397.46 1426.76 1456.05 1485.35 1517.58 1549.80 1582.03 1617.19 1649.41 1684.57 1719.73 1754.88 1792.97 1831.05 1869.14 1907.23 1948.24 1989.26 2030.27 2074.22 2118.16 2162.11 2206.05 2252.93 2299.80 2349.61 2399.41 2449.22 2499.02 2551.76 2607.42 2660.16 2715.82 2774.41 2833.01 2891.60 2953.13 3014.65 3079.10 3143.55 3208.01 3275.39 3345.70 3416.02 3486.33 3559.57 3635.74 3711.91 3791.02 3870.12 3952.15 4034.18 4119.14 4204.10 4291.99 4382.81 4476.56 4570.31 4666.99 4763.67 4863.28 4965.82 5071.29 5176.76 5285.16 5396.48 5510.74 5625.00 5745.12 5865.23 5988.28 6114.26 6243.16 6372.07 6506.84 6644.53 6785.16 6925.78 7072.27 7221.68 7371.09 7526.37 7684.57 7845.70 8012.70 8179.69 8352.54 8528.32 8707.03 8888.67 9076.17 9266.60 9462.89 9659.18 9864.26 10069.34 10283.20 10497.07 10719.73 10945.31 11173.83 11408.20 11648.44 11891.60 12143.55 12398.44 12659.18 12925.78 13195.31 13473.63 13757.81 14044.92 14340.82 14642.58 14950.20 15263.67 15583.01 15911.13 16245.12 16587.89 16936.52 17291.02 17654.30 18026.37 18404.30 18791.02 19186.52 19590.82 20000.98" + responses="-0.23 -0.26 -0.09 -0.28 -0.46 -0.32 -0.06 0.10 -0.28 -0.41 -0.07 0.21 0.34 0.30 0.25 0.15 0.06 0.07 0.22 0.31 0.45 0.63 0.97 1.21 0.86 0.65 0.74 0.80 0.85 1.06 1.38 1.14 0.77 1.31 1.54 1.63 1.74 1.71 1.52 1.43 1.53 1.99 2.00 1.63 1.75 1.44 1.11 1.21 0.77 0.83 0.89 0.72 0.40 0.70 0.45 0.28 0.62 0.14 0.58 0.37 -0.11 -0.44 0.09 -0.65 -0.58 -0.28 -0.26 0.37 0.58 1.32 1.21 2.02 2.06 2.61 2.57 3.16 3.02 2.87 2.88 2.68 2.65 2.34 2.39 2.54 2.48 1.65 1.14 0.70 0.89 0.19 -0.62 -0.82 -1.17 -1.16 -1.26 -0.66 0.27 0.48 1.28 1.53 1.93 2.14 2.37 1.95 1.60 1.87 1.50 1.71 0.98 0.83 0.08 0.20 0.30 0.64 0.50 0.53 1.18 1.59 1.73 1.64 2.32 1.66 0.61 0.19 0.56 1.85 0.85 1.58 1.92 2.43 1.99 3.69 2.60 1.52 0.76 -0.41 0.24 1.43 0.74 2.95 3.42 4.31 5.74 3.68 3.30 2.89 4.54 4.18 2.47 0.86 -0.55 -1.71 0.90 1.25 2.66 3.38 0.95 5.23 1.42 1.90 3.38 4.70 5.37 3.67 3.75 1.72 5.67 1.36 3.03 7.54 6.71 3.45 0.58 1.22 6.80 5.61 5.71 1.37 -2.06 4.23 5.43 3.43 0.46 2.00 4.63 3.30 3.09 2.44 3.93 4.73 5.21 5.52 5.90 4.01 5.06 5.48 8.03 9.33 5.17 4.77 6.23 6.26 6.78 6.95 6.29 8.82 5.60 4.80 2.16 6.09 2.90 6.41 7.52 7.85 6.48 5.12 6.13 7.79 5.50 9.06 7.82 9.98 9.14 10.36 9.29 9.01 6.95 10.98 11.82 12.02 11.49 13.30 11.53 12.65 13.53 12.21 12.64 14.07 14.12 14.71 15.08 16.27 17.73 17.54 18.24 16.64 17.24 17.17 16.96 16.25 18.65 17.64 14.89 15.97 32.20 19.96" + sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 0.0 1.0" geometric_location="0.0225 0.0081 0.0078" /> + group="0" index_in_the_group="1" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="256" + frequencies="99.61 102.54 105.47 108.40 111.33 114.26 117.19 120.12 123.05 125.98 128.91 131.84 134.77 137.70 140.63 143.55 146.48 149.41 152.34 155.27 158.20 161.13 164.06 166.99 169.92 172.85 175.78 178.71 181.64 184.57 187.50 190.43 193.36 199.22 202.15 205.08 210.94 213.87 219.73 222.66 228.52 234.38 237.30 243.16 249.02 254.88 257.81 263.67 269.53 275.39 281.25 287.11 292.97 298.83 307.62 313.48 319.34 325.20 333.98 339.84 345.70 354.49 360.35 369.14 377.93 383.79 392.58 401.37 410.16 418.95 427.73 436.52 445.31 454.10 462.89 474.61 483.40 495.12 503.91 515.63 524.41 536.13 547.85 559.57 571.29 583.01 594.73 609.38 621.09 632.81 647.46 662.11 673.83 688.48 703.13 717.77 732.42 750.00 764.65 779.30 796.88 814.45 832.03 846.68 867.19 884.77 902.34 922.85 940.43 960.94 981.45 1001.95 1022.46 1042.97 1066.41 1089.84 1110.35 1133.79 1157.23 1183.59 1207.03 1233.40 1259.77 1286.13 1312.50 1338.87 1368.16 1397.46 1426.76 1456.05 1485.35 1517.58 1549.80 1582.03 1617.19 1649.41 1684.57 1719.73 1754.88 1792.97 1831.05 1869.14 1907.23 1948.24 1989.26 2030.27 2074.22 2118.16 2162.11 2206.05 2252.93 2299.80 2349.61 2399.41 2449.22 2499.02 2551.76 2607.42 2660.16 2715.82 2774.41 2833.01 2891.60 2953.13 3014.65 3079.10 3143.55 3208.01 3275.39 3345.70 3416.02 3486.33 3559.57 3635.74 3711.91 3791.02 3870.12 3952.15 4034.18 4119.14 4204.10 4291.99 4382.81 4476.56 4570.31 4666.99 4763.67 4863.28 4965.82 5071.29 5176.76 5285.16 5396.48 5510.74 5625.00 5745.12 5865.23 5988.28 6114.26 6243.16 6372.07 6506.84 6644.53 6785.16 6925.78 7072.27 7221.68 7371.09 7526.37 7684.57 7845.70 8012.70 8179.69 8352.54 8528.32 8707.03 8888.67 9076.17 9266.60 9462.89 9659.18 9864.26 10069.34 10283.20 10497.07 10719.73 10945.31 11173.83 11408.20 11648.44 11891.60 12143.55 12398.44 12659.18 12925.78 13195.31 13473.63 13757.81 14044.92 14340.82 14642.58 14950.20 15263.67 15583.01 15911.13 16245.12 16587.89 16936.52 17291.02 17654.30 18026.37 18404.30 18791.02 19186.52 19590.82 20000.98" + responses="-1.45 -1.74 -1.62 -1.75 -1.67 -1.48 -1.69 -1.91 -1.82 -1.75 -1.49 -1.36 -1.35 -1.27 -1.19 -1.19 -1.09 -1.11 -1.27 -1.27 -1.11 -0.83 -0.56 -0.57 -0.58 -0.47 -0.51 -0.57 -0.63 -0.64 -0.55 -0.68 -0.76 0.01 0.32 0.41 0.29 0.43 0.12 -0.14 0.23 0.16 0.18 0.09 -0.02 -0.14 -0.12 -0.40 -0.43 -0.15 -0.21 -0.42 -0.54 -0.33 -0.46 -0.80 -0.66 -0.71 -0.77 -0.96 -1.28 -1.32 -1.27 -1.37 -1.49 -1.47 -1.43 -1.28 -1.11 -0.79 -0.72 -0.45 0.30 0.47 0.90 0.95 0.95 0.94 0.75 0.65 0.83 0.24 0.11 0.00 0.08 -0.13 -0.44 0.18 0.43 0.43 0.18 0.00 -0.31 -0.80 -1.14 -0.72 -0.76 -0.50 -0.08 0.25 0.88 0.75 0.79 0.66 0.63 0.68 0.52 0.87 1.03 0.67 0.14 0.10 0.17 0.37 0.45 0.33 0.13 0.26 0.42 0.74 1.24 2.22 1.95 1.79 1.46 2.64 2.69 1.25 2.12 2.39 3.18 3.51 3.19 3.16 2.61 2.39 3.43 4.79 5.43 6.08 7.01 7.05 5.81 5.07 4.19 3.89 3.46 3.45 3.20 3.52 4.61 4.17 4.05 4.68 4.64 5.46 6.00 7.41 6.59 5.77 6.67 7.74 5.93 6.17 8.07 7.02 9.90 7.96 6.70 8.76 9.04 7.09 8.24 8.27 9.35 6.82 5.38 6.28 6.10 8.48 6.25 6.74 5.10 7.17 7.83 3.66 5.75 7.68 6.52 7.64 9.37 8.45 10.19 10.18 9.60 9.90 10.89 10.56 12.34 10.02 12.48 9.36 12.95 10.50 10.50 11.81 10.16 8.86 8.92 9.29 9.84 12.21 12.31 13.39 11.54 12.38 12.10 13.03 10.77 13.94 14.73 15.59 15.73 17.14 17.77 15.20 14.12 15.84 13.98 17.79 19.86 18.31 17.22 17.24 16.79 15.97 16.11 15.90 17.19 17.55 15.84 13.70 16.01 15.66 14.27 15.13 15.95 14.48 14.71 14.88 15.13 13.25 13.74 10.18 9.94 11.96" + sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 0.0 1.0" geometric_location="0.0353 0.1361 0.0078" /> From db3dfbfa74ac125c74c5f90d16186794e81cafe2 Mon Sep 17 00:00:00 2001 From: Kumar Anand Date: Thu, 3 May 2018 14:46:51 -0700 Subject: [PATCH 45/53] wifi: Re-enable TSO TCP Segmentation Offload (TSO) is re-enabled to meet TCP TX (UL) throughput. Bug: 78503031 Test: Performance Test Change-Id: I67b27ee59e8f8a7c89fb8c2fbae32d264de2ff90 --- WCNSS_qcom_cfg.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini index c61ffc6..6e607ab 100644 --- a/WCNSS_qcom_cfg.ini +++ b/WCNSS_qcom_cfg.ini @@ -228,7 +228,7 @@ gEnableIpTcpUdpChecksumOffload=1 # Enable TCP Segmentation Offload # 1 - enable 0 - disable -TSOEnable=0 +TSOEnable=1 # Enable HT MPDU Density # 4 for 2 micro sec From 037847c955404e9b5d92a04717e0144d575c07f4 Mon Sep 17 00:00:00 2001 From: jiabin Date: Wed, 9 May 2018 16:47:28 -0700 Subject: [PATCH 46/53] Populate microphone characteristics and snd device mapping Populate microphone characteristics for supported microphones on platform. Map input sound devices to specific microphone ids. Bug: 75041465 Test: try open mic and print log to check if the info is correct Change-Id: I85a3a76cf14c78100a1b1e82add603c1a9781617 --- audio_platform_info_tavil.xml | 42 +++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml index 45ef307..6b994bd 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -128,8 +128,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a5d60fa7d6942f981f7843f724880e74a7a4d0f6 Mon Sep 17 00:00:00 2001 From: Siddharth Ray Date: Wed, 16 May 2018 15:20:02 -0700 Subject: [PATCH 47/53] Walleye connectivity power profile Cellular, Wifi and GPS power profile for Walleye is updated to values based on device power measurements. BUG:79879615 Change-Id: I7405a0f9e3df878ba79bb7e108eb3c629f299792 --- .../base/core/res/res/xml/power_profile.xml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml index b58f2de..a7b93b9 100644 --- a/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -191,35 +191,35 @@ 74.758 - 1 + 2 - 125 + 166 - 350 + 720 3700 0 - 110 + 145 - 128 + 147 - 1 - 5 - 26 - 100 - 249 + 153 + 198 + 259 + 310 + 395 3700 - 32 - 4 + 49 + 8 3700 From 2e178d0ed68900670eee6fbf8b6d1c324c1ddcc4 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 16 May 2018 18:21:42 -0700 Subject: [PATCH 48/53] walleye: Set vendor specific TPC Report IE by default Configuration ini parameter 'g_probe_req_ie_bitmap_6' is set to have vendor specific IE(TPC Report)ini parameter but the ini parameter 'gProbeReqOUIs' is not set to hold the respective OUI. Set vendor specific TPC Report IE by default, by adding 'gProbeReqOUIs' ini parameter with TPC Report OUI. Change-Id: I73e7763a6eb7a8562b729c469f0ad98a990c97a0 CRs-Fixed: 2241474 Bug: 79873627 Signed-off-by: Srinivas Girigowda --- WCNSS_qcom_cfg.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini index 6e607ab..9f945f1 100644 --- a/WCNSS_qcom_cfg.ini +++ b/WCNSS_qcom_cfg.ini @@ -321,6 +321,8 @@ g_probe_req_ie_bitmap_0=0x0000000B g_probe_req_ie_bitmap_6=0x20000000 # g_probe_req_ie_bitmap_7=0x00000000 +gProbeReqOUIs=0050F208 + ############################################# # Power related configurations ############################################# From 6bca10df1e49da82089a84431d84f38701f7f3a4 Mon Sep 17 00:00:00 2001 From: juyuchen Date: Tue, 22 May 2018 17:00:11 +0800 Subject: [PATCH 49/53] audio: update table : add bt-sco and speaker-safe path Bug: 78257659 Test: manual audio test on S2 Signed-off-by: juyuchen --- audio_platform_info_tavil.xml | 2 ++ mixer_paths_tavil.xml | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml index 6b994bd..0194019 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -102,7 +102,9 @@ + + diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml index 007ac6e..c568445 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -1862,6 +1862,26 @@ + + + + + + + + + + + + + + + + + + + + From 1af11dec3f0c8800ed6d0d0454a9191e190678b7 Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Wed, 23 May 2018 17:35:18 -0700 Subject: [PATCH 50/53] Excluding location.network from aosp-walleye Test: lunch aosp_walleye-userdebug, build, flash run atest android.app.cts.SystemFeaturesTest Bug: 33380753 Change-Id: I81547dd63962dd9ae332e78be8807527e932f7b5 --- aosp_walleye.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aosp_walleye.mk b/aosp_walleye.mk index 80bb0d7..9f45dda 100644 --- a/aosp_walleye.mk +++ b/aosp_walleye.mk @@ -30,7 +30,8 @@ PRODUCT_PACKAGES += \ vndk_package PRODUCT_COPY_FILES += \ - device/google/muskie/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml + device/google/muskie/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ + frameworks/native/data/etc/aosp_excluded_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/aosp_excluded_hardware.xml PRODUCT_RESTRICT_VENDOR_FILES := owner From 0b66ff18b13a8acf29f0e5cbb47882cc8c0912a2 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 29 May 2018 16:16:42 -0700 Subject: [PATCH 51/53] Changing the default launcher and recents implementation for aosp build Bug: 77490347 Test: Build and flashed system image Change-Id: Ic96d55e81e3a0c2b62fb5b975e3ebc67335c7ef8 --- aosp_walleye.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aosp_walleye.mk b/aosp_walleye.mk index 9f45dda..888c67d 100644 --- a/aosp_walleye.mk +++ b/aosp_walleye.mk @@ -25,7 +25,7 @@ $(call inherit-product-if-exists, vendor/google_devices/muskie/proprietary/devic PRODUCT_PACKAGES += \ netutils-wrapper-1.0 \ Dialer \ - Launcher3 \ + Launcher3QuickStep \ WallpaperPicker \ vndk_package From 2828b261d7a5ee98665537ba2bfc40c1451b48db Mon Sep 17 00:00:00 2001 From: Shawn Yang Date: Thu, 31 May 2018 17:51:47 -0700 Subject: [PATCH 52/53] Update board-info.txt generation method Bug: 80490116 Update makefile to remove direct shell call to generate the board-info.txt file. Test: Manually verify the build passed and board-info.txt generated contains correct info Change-Id: I32919ec218b8869786b1d170ef0576d602e72fc2 --- AndroidBoard.mk | 17 +++++++++++++++++ walleye/AndroidBoard.mk | 1 + 2 files changed, 18 insertions(+) create mode 100644 AndroidBoard.mk create mode 120000 walleye/AndroidBoard.mk diff --git a/AndroidBoard.mk b/AndroidBoard.mk new file mode 100644 index 0000000..6ec4ce4 --- /dev/null +++ b/AndroidBoard.mk @@ -0,0 +1,17 @@ +# +# Copyright 2018 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. +# + +-include vendor/google_devices/muskie/proprietary/AndroidBoardVendor.mk diff --git a/walleye/AndroidBoard.mk b/walleye/AndroidBoard.mk new file mode 120000 index 0000000..c0a3afc --- /dev/null +++ b/walleye/AndroidBoard.mk @@ -0,0 +1 @@ +../AndroidBoard.mk \ No newline at end of file From 722ea29d02b5b6d741977362d62515fa4773163f Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Tue, 5 Jun 2018 15:22:31 -0700 Subject: [PATCH 53/53] Revert "Switch to deadline IO scheduler post boot." This reverts commit ae780bce59f38ce08995dfb025b2da547b8ef948. Test: boots bug: 63630139 --- init-common.rc | 2 -- 1 file changed, 2 deletions(-) diff --git a/init-common.rc b/init-common.rc index 73d2f81..356c9d8 100644 --- a/init-common.rc +++ b/init-common.rc @@ -15,8 +15,6 @@ on property:sys.boot_completed=1 write /sys/block/sda/queue/iostats 1 write /sys/block/dm-0/queue/read_ahead_kb 512 write /sys/block/dm-1/queue/read_ahead_kb 512 - write /sys/block/sda/queue/scheduler deadline - write /sys/block/sde/queue/scheduler deadline on property:sys.boot_completed=1 && property:ro.build.type=user write /proc/sys/kernel/modules_disabled 1