From 44ade44708dac709f8226998bd29b71656967446 Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Thu, 17 Aug 2017 12:14:53 -0700 Subject: 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: I233a44c2ba0cb4c4d4fb8c3720fc09862ce79827 Signed-off-by: Kevin Rocard --- aosp_taimen.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_taimen.mk b/aosp_taimen.mk index 5a202b8..a313ff5 100644 --- a/aosp_taimen.mk +++ b/aosp_taimen.mk @@ -31,7 +31,7 @@ PRODUCT_PACKAGES += \ WallpaperPicker PRODUCT_COPY_FILES += \ - device/google/taimen/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf + device/google/taimen/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 32a4082..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 b4398408-1fb9-11e7-93ae-92361f002671 - } - ns { - library audio_pre_processing - uuid b43988c2-1fb9-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..f22bf51 --- /dev/null +++ b/audio_effects.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From e8e3c90e12a4dfe80765f66b23ca3b618d52ac2e Mon Sep 17 00:00:00 2001 From: Ningyuan Wang Date: Fri, 25 Aug 2017 14:12:02 -0700 Subject: taimen 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: I2d98abc442f9042abb58929a7010246b8b226d21 --- 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 -- cgit v1.2.3 From 90f8ebdc0d65d090421910e40fb6b25b74dd6ca0 Mon Sep 17 00:00:00 2001 From: Jaekyun Seok Date: Wed, 30 Aug 2017 10:52:39 +0900 Subject: Add 'vendor.' prefix to a vendor HAL service name To prevent property name collisions between properties of system and vendor, 'vendor.' prefix must be added to a vendor HAL service name. You can see the details in http://go/treble-sysprop-compatibility. Test: succeeded building and tested on a taimen device. Bug: 36796459 Change-Id: I1292f57b7ad27d0f96726f2073a5720b78281834 --- init-taimen.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init-taimen.rc b/init-taimen.rc index 0ea849f..c08a1aa 100644 --- a/init-taimen.rc +++ b/init-taimen.rc @@ -35,8 +35,8 @@ on init && property:ro.boot.slot=* on init && property:ro.boot.revision=* setprop ro.boot.hardware.revision ${ro.boot.revision} -on property:init.svc.fps_hal=running && property:ro.boot.revision=rev_0 - stop fps_hal +on property:init.svc.vendor.fps_hal=running && property:ro.boot.revision=rev_0 + stop vendor.fps_hal on property:sys.all.modules.ready=1 # Update touch firmware if required -- cgit v1.2.3 From dce7e7537d9100ac81d88be34d8ea4d7254893a7 Mon Sep 17 00:00:00 2001 From: Jie Song Date: Wed, 16 Aug 2017 11:56:14 -0700 Subject: Number of log files in Bugreport Bug: 64329189 Test: Check number of log files in Bugreport Change-Id: I2119f0dc898d67d6dab14fca7d2477997a7d559f --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index f8b8505..be6c1ba 100644 --- a/device.mk +++ b/device.mk @@ -103,6 +103,7 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PROPERTY_OVERRIDES += \ persist.sys.modem.diag.qdb=0\ persist.sys.modem.diag.mdlog=true \ + persist.sys.modem.diag.mdlog_br_num=5 \ ro.radio.log_loc="/data/vendor/modem_dump" \ ro.radio.log_prefix="modem_log_" endif -- cgit v1.2.3 From c2b5bb133e4f6f005b60714247e7b707542fb99a Mon Sep 17 00:00:00 2001 From: Jeff Vander Stoep Date: Thu, 5 Oct 2017 14:42:30 -0700 Subject: sepolicy: add owners file Test: build Change-Id: I963860dd1d92da5d1971fe862749de040e48f857 --- 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 -- cgit v1.2.3 From 80da5c33e64536db44f3a15bcaf1c7e9163bc5cd Mon Sep 17 00:00:00 2001 From: Fyodor Kupolov Date: Thu, 19 Oct 2017 10:19:38 -0700 Subject: Disable privapp-permissions whitelist enforcement on aosp_taimen Otherwise device won't boot due to whitelist violations. Bug: 67718369 Test: manual Change-Id: I1f4b0b07a3397d8eddc0a12f822e475be77bf514 --- aosp_taimen.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aosp_taimen.mk b/aosp_taimen.mk index a313ff5..e6aaa2d 100644 --- a/aosp_taimen.mk +++ b/aosp_taimen.mk @@ -14,6 +14,10 @@ # limitations under the License. # +# b/67718369 temporarily disable privapp-permissions whitelist enforcement +PRODUCT_PROPERTY_OVERRIDES += \ + ro.control_privapp_permissions=disable + # Get the full APNs PRODUCT_COPY_FILES := device/google/wahoo/apns-full-conf.xml:system/etc/apns-conf.xml -- cgit v1.2.3 From 9302d23a62c0c04914ef9bff324b1d8411bd0059 Mon Sep 17 00:00:00 2001 From: "taeho.youn" Date: Tue, 17 Oct 2017 11:54:40 +0900 Subject: audio: taimen: changing mic for camcording - Change the recording microphone from bottom to the top edge - Updated mixer path config to enable 24 bit signalling on recording path - Adjusted microphone gain on mixer path Bug : 67865936 Test: acoustic verification test Change-Id: Id2332e906a89fda93ea796c3f9e2c54e40a74b87 --- mixer_paths_tavil.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml index d1c6c69..5ba1e00 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -1560,10 +1560,11 @@ - + - - + + + -- cgit v1.2.3 From 3dcc6c376ac63e3afd9164aad9b1c47f9712a56c Mon Sep 17 00:00:00 2001 From: Fyodor Kupolov Date: Mon, 23 Oct 2017 17:00:02 -0700 Subject: Enabled whitelist enforcement on aosp_taimen Test: manual Bug: 67718369 Change-Id: I98b08a0bd814a8dc247a62875057252ea24e629e --- aosp_taimen.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/aosp_taimen.mk b/aosp_taimen.mk index e6aaa2d..a313ff5 100644 --- a/aosp_taimen.mk +++ b/aosp_taimen.mk @@ -14,10 +14,6 @@ # limitations under the License. # -# b/67718369 temporarily disable privapp-permissions whitelist enforcement -PRODUCT_PROPERTY_OVERRIDES += \ - ro.control_privapp_permissions=disable - # Get the full APNs PRODUCT_COPY_FILES := device/google/wahoo/apns-full-conf.xml:system/etc/apns-conf.xml -- cgit v1.2.3 From 5e3069df106f86d819e479c4ecff61e0b31f6440 Mon Sep 17 00:00:00 2001 From: Mohan Srinivasan Date: Fri, 27 Oct 2017 15:45:58 -0700 Subject: 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: I40baa222c92330757303ee9c2fd0e3f075dfac78 Signed-off-by: Mohan Srinivasan --- init-taimen.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/init-taimen.rc b/init-taimen.rc index da6a3cc..5ac3893 100644 --- a/init-taimen.rc +++ b/init-taimen.rc @@ -23,6 +23,8 @@ on property:sys.boot_completed=1 write /sys/block/sde/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 boot # Allow ftm4 autotune from adb shell -- cgit v1.2.3 From 5e7b2dcfbe2311a23940aa6f678a46eae69c2902 Mon Sep 17 00:00:00 2001 From: Siqi Lin Date: Mon, 30 Oct 2017 15:28:21 -0700 Subject: Add taimen_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: Ib4a8ccf7f84c0bf106d5d937b420bca13f6e6d47 --- BoardConfig.mk | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/BoardConfig.mk b/BoardConfig.mk index c6c51f0..d09b704 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -41,6 +41,34 @@ BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/kasan/ftm4.ko \ device/google/wahoo-kernel/kasan/sw49408.ko \ device/google/wahoo-kernel/kasan/lge_battery.ko +else ifeq (,$(filter-out taimen_kernel_debug_memory, $(TARGET_PRODUCT))) +# if TARGET == taimen_kernel_debug_memory +BOARD_VENDOR_KERNEL_MODULES += \ + device/google/wahoo-kernel/debug_memory/touch_core_base.ko \ + device/google/wahoo-kernel/debug_memory/ftm4.ko \ + device/google/wahoo-kernel/debug_memory/sw49408.ko \ + device/google/wahoo-kernel/debug_memory/lge_battery.ko +else ifeq (,$(filter-out taimen_kernel_debug_locking, $(TARGET_PRODUCT))) +# if TARGET == taimen_kernel_debug_locking +BOARD_VENDOR_KERNEL_MODULES += \ + device/google/wahoo-kernel/debug_locking/touch_core_base.ko \ + device/google/wahoo-kernel/debug_locking/ftm4.ko \ + device/google/wahoo-kernel/debug_locking/sw49408.ko \ + device/google/wahoo-kernel/debug_locking/lge_battery.ko +else ifeq (,$(filter-out taimen_kernel_debug_hang, $(TARGET_PRODUCT))) +# if TARGET == taimen_kernel_debug_hang +BOARD_VENDOR_KERNEL_MODULES += \ + device/google/wahoo-kernel/debug_hang/touch_core_base.ko \ + device/google/wahoo-kernel/debug_hang/ftm4.ko \ + device/google/wahoo-kernel/debug_hang/sw49408.ko \ + device/google/wahoo-kernel/debug_hang/lge_battery.ko +else ifeq (,$(filter-out taimen_kernel_debug_api, $(TARGET_PRODUCT))) +# if TARGET == taimen_kernel_debug_api +BOARD_VENDOR_KERNEL_MODULES += \ + device/google/wahoo-kernel/debug_api/touch_core_base.ko \ + device/google/wahoo-kernel/debug_api/ftm4.ko \ + device/google/wahoo-kernel/debug_api/sw49408.ko \ + device/google/wahoo-kernel/debug_api/lge_battery.ko else BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/touch_core_base.ko \ -- cgit v1.2.3 From 8869af60e6e71c86ef4f62db1e08cd50e824e7a7 Mon Sep 17 00:00:00 2001 From: "hyunho.koh" Date: Fri, 3 Nov 2017 13:46:13 +0900 Subject: taimen: NFC: update NFC GPIO 5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In NXP_CORE_CONF_EXTN add value A0, 08, 02, 00, 81 To be set the Port define as Output/Low by NFC’s GPIO5 Test: NFC Tag read, HCE Bug:68832228 Change-Id: Ia284e2f302395348937ec6e5b0f973e9f77f1278 --- nfc/libnfc-nxp.taimen.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nfc/libnfc-nxp.taimen.conf b/nfc/libnfc-nxp.taimen.conf index 620ba70..23971fe 100644 --- a/nfc/libnfc-nxp.taimen.conf +++ b/nfc/libnfc-nxp.taimen.conf @@ -227,7 +227,7 @@ NXP_SET_CONFIG_ALWAYS=0x00 # UICC2 bit rate A0D1 # SWP1A interface A0D4 # DWP intf behavior config, SVDD Load activated by default if set to 0x31 A037 -NXP_CORE_CONF_EXTN={20, 02, 2D, 0B, +NXP_CORE_CONF_EXTN={20, 02, 32, 0C, A0, EC, 01, 01, A0, ED, 01, 01, A0, 5E, 01, 01, @@ -238,7 +238,8 @@ NXP_CORE_CONF_EXTN={20, 02, 2D, 0B, A0, D1, 01, 02, A0, D4, 01, 00, A0, DD, 01, 2D, - A0, 37, 01, 35 + A0, 37, 01, 35, + A0, 08, 02, 00, 81 } # A0, F2, 01, 01, # A0, 40, 01, 01, -- cgit v1.2.3 From 3b95b339e7c9a04e0bcba5247bde1e3cfb02844f Mon Sep 17 00:00:00 2001 From: "hyunho.koh" Date: Fri, 3 Nov 2017 13:46:13 +0900 Subject: taimen: NFC: update NFC GPIO 5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In NXP_CORE_CONF_EXTN add value A0, 08, 02, 00, 81 To be set the Port define as Output/Low by NFC’s GPIO5 Test: NFC Tag read, HCE Bug:68832228 Change-Id: Ia284e2f302395348937ec6e5b0f973e9f77f1278 --- nfc/libnfc-nxp.taimen.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nfc/libnfc-nxp.taimen.conf b/nfc/libnfc-nxp.taimen.conf index 620ba70..23971fe 100644 --- a/nfc/libnfc-nxp.taimen.conf +++ b/nfc/libnfc-nxp.taimen.conf @@ -227,7 +227,7 @@ NXP_SET_CONFIG_ALWAYS=0x00 # UICC2 bit rate A0D1 # SWP1A interface A0D4 # DWP intf behavior config, SVDD Load activated by default if set to 0x31 A037 -NXP_CORE_CONF_EXTN={20, 02, 2D, 0B, +NXP_CORE_CONF_EXTN={20, 02, 32, 0C, A0, EC, 01, 01, A0, ED, 01, 01, A0, 5E, 01, 01, @@ -238,7 +238,8 @@ NXP_CORE_CONF_EXTN={20, 02, 2D, 0B, A0, D1, 01, 02, A0, D4, 01, 00, A0, DD, 01, 2D, - A0, 37, 01, 35 + A0, 37, 01, 35, + A0, 08, 02, 00, 81 } # A0, F2, 01, 01, # A0, 40, 01, 01, -- cgit v1.2.3 From a2bea547bebfffc4fe796164081d09de001bdd95 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 20 Nov 2017 10:50:16 -0800 Subject: Add system/framework/qcrilhook.jar BUG:69427786 TEST: built and flashed taimen Change-Id: Ie6bf521c14244651d81bbb849c3019936bd2eb05 --- 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 612eda7..d3f1fd9 100644 --- a/self-extractors/qcom/staging/device-partial.mk +++ b/self-extractors/qcom/staging/device-partial.mk @@ -28,6 +28,7 @@ PRODUCT_COPY_FILES := \ vendor/qcom/taimen/proprietary/com.quicinc.cne.api-V1.0-java.jar:system/framework/com.quicinc.cne.api-V1.0-java.jar:qcom \ vendor/qcom/taimen/proprietary/com.quicinc.cne.jar:system/framework/com.quicinc.cne.jar:qcom \ vendor/qcom/taimen/proprietary/embmslibrary.jar:system/framework/embmslibrary.jar:qcom \ + vendor/qcom/taimen/proprietary/qcrilhook.jar:system/framework/qcrilhook.jar:qcom \ vendor/qcom/taimen/proprietary/rcsimssettings.jar:system/framework/rcsimssettings.jar:qcom \ vendor/qcom/taimen/proprietary/vendor.qti.qcril.am-V1.0-java.jar:system/framework/vendor.qti.qcril.am-V1.0-java.jar:qcom \ vendor/qcom/taimen/proprietary/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \ -- cgit v1.2.3 From ef7aece760a224bc434882bb76157d1edf4d3732 Mon Sep 17 00:00:00 2001 From: Vishwath Mohan Date: Tue, 21 Nov 2017 14:35:17 -0800 Subject: Add support for taimen_kcfi targets. Adds support for a kernel CFI enabled target for Taimen. Bug: 67506682 Test: lunch taimen_kcfi && m -j50 Change-Id: I79519e229e8186532425b69860b70f0b51d716ec --- BoardConfig.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/BoardConfig.mk b/BoardConfig.mk index d09b704..ad04966 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -41,6 +41,13 @@ BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/kasan/ftm4.ko \ device/google/wahoo-kernel/kasan/sw49408.ko \ device/google/wahoo-kernel/kasan/lge_battery.ko +else ifeq (,$(filter-out taimen_kcfi, $(TARGET_PRODUCT))) +# if TARGET_PRODUCT == taimen_kcfi +BOARD_VENDOR_KERNEL_MODULES += \ + device/google/wahoo-kernel/kcfi/touch_core_base.ko \ + device/google/wahoo-kernel/kcfi/ftm4.ko \ + device/google/wahoo-kernel/kcfi/sw49408.ko \ + device/google/wahoo-kernel/kcfi/lge_battery.ko else ifeq (,$(filter-out taimen_kernel_debug_memory, $(TARGET_PRODUCT))) # if TARGET == taimen_kernel_debug_memory BOARD_VENDOR_KERNEL_MODULES += \ -- cgit v1.2.3 From 1684b86633d39076c7a518f4f9f9d4e4511a042c Mon Sep 17 00:00:00 2001 From: David Lin Date: Tue, 5 Dec 2017 13:07:03 -0800 Subject: 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: Ia5e11602dd5f9b98b91c6bf887c3a06252c591cd Signed-off-by: David Lin --- mixer_paths_tavil.xml | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml index 5ba1e00..406efe9 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -83,8 +83,10 @@ + + @@ -116,6 +118,9 @@ + + + @@ -198,6 +203,7 @@ + @@ -205,7 +211,9 @@ + + @@ -513,12 +521,6 @@ - - - - - - @@ -865,10 +867,31 @@ + + + + + + + + + + + + + + + + + + + + + @@ -881,10 +904,23 @@ + + + + + + + + + + + + + -- cgit v1.2.3 From 93ed3442cc4ce0d3f805b1b7c793f58e4dceaf67 Mon Sep 17 00:00:00 2001 From: Kumar Anand Date: Tue, 12 Dec 2017 14:28:08 -0800 Subject: wifi: taimen 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: If49bbefa56b4e2b13a7abbd071c7067c769f65f7 --- 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 ############################################# -- cgit v1.2.3 From 538997c53fed0c45474eb8b95977b0b09f38ed3b Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Mon, 8 Jan 2018 18:33:09 +0000 Subject: Add display calibration info. Also, move to a nits-based autobrightness curve. Bug: 71706239 Test: Boot Taimen device, see we get a PhysicalBrightnessMapper in dumpsys display Change-Id: I01c6cc1d3abe1c3e547556fc04a41225719cd94f --- .../frameworks/base/core/res/res/values/config.xml | 221 +++++++++++++++++---- 1 file changed, 178 insertions(+), 43 deletions(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 5605121..f832887 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -49,40 +49,33 @@ 5000 - - - 9 - 30 - 45 - 62 - 78 - 96 - 119 - 146 - 178 - 221 - 255 - + + + 13.25 + 54 + 78.85 + 105.02 + 132.7 + 170.12 + 212.1 + 265.2 + 335.8 + 415.2 + 478.5 + - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 600 @@ -92,15 +85,6 @@ that can be set by the user. --> 15 - - 1 - 13 @@ -113,7 +97,158 @@ - 4 + 1 + + + + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 25 + 30 + 35 + 40 + 45 + 50 + 55 + 60 + 65 + 70 + 75 + 80 + 85 + 90 + 95 + 100 + 105 + 110 + 115 + 120 + 125 + 130 + 135 + 140 + 145 + 150 + 155 + 160 + 165 + 170 + 175 + 180 + 185 + 190 + 195 + 200 + 205 + 210 + 215 + 220 + 225 + 230 + 235 + 240 + 245 + 250 + 255 + + + + + 2.685 + 3.343 + 4.13 + 5.216 + 6.308 + 7.565 + 9.269 + 10.98 + 13.25 + 15.49 + 18.42 + 20.6 + 22.71 + 24.68 + 26.31 + 28.39 + 30.34 + 32.39 + 33.94 + 35.94 + 45.12 + 54 + 62.31 + 70.73 + 78.85 + 86.41 + 93.53 + 102.3 + 109.1 + 118.7 + 126.4 + 136.9 + 147.8 + 158.9 + 168.3 + 177.4 + 186.6 + 195.7 + 204.5 + 214 + 221.8 + 234 + 242.1 + 250.6 + 263.4 + 272.4 + 282.5 + 296.3 + 305.6 + 315.3 + 329.8 + 339.8 + 349.7 + 357.4 + 364.6 + 374.6 + 384.9 + 392.5 + 402.8 + 413.6 + 421.6 + 432.2 + 440.3 + 448.3 + 459.2 + 467.6 + 478.5 + -- cgit v1.2.3 From 33746f88ad89bdb5f7cc3ddb5a5db8f560f66d52 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Sat, 13 Jan 2018 21:44:13 -0800 Subject: Disable seamless transition for taimen config_displayBlanksAfterDoze was removed from wahoo and needs to be set on the device overlay Bug: 71897888 Test: flash taimen, press power button when in AoD Change-Id: Ic54a0bd2f951b62726ae5451bfe83132f619af6d --- overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index f832887..60af8df 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -88,6 +88,9 @@ 13 + + true + 98 -- cgit v1.2.3 From b5e737604fc636af50f0c1e90e2120524f0e2bed Mon Sep 17 00:00:00 2001 From: Siddharth Ray Date: Wed, 17 Jan 2018 15:17:51 -0800 Subject: Cellular/Wifi power profile for Taimen BUG:67213967 Change-Id: I2178baea60d96b05be3f0751e2fe28d9b1c02064 --- .../base/core/res/res/xml/power_profile.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) 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 1fcf817..610de36 100644 --- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -163,6 +163,15 @@ 30 + + 1 + + 103 + + 250 + + 3800 + 50 @@ -177,4 +186,17 @@ 3 + + 1 + 25 + 50 + + 1 + 53 + 100 + 150 + 200 + + 3700 + -- cgit v1.2.3 From eb6964a517a495053b2c7b737138b201993dbf55 Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Wed, 17 Jan 2018 15:57:39 -0800 Subject: 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 d4b125a..c040c4d 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 -- cgit v1.2.3 From 43ef1127261b5f89cb11e796c80160a49d561aa3 Mon Sep 17 00:00:00 2001 From: Nadav Bar Date: Sun, 7 Jan 2018 12:11:24 +0200 Subject: Add incall music to taimen mixer paths This change adds the paths for taimen 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: I5e5b7b4fa1169988f802f9da33e0db97964c73ce --- audio_platform_info_tavil.xml | 1 + mixer_paths_tavil.xml | 69 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml index 69ae11a..7b33970 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -63,6 +63,7 @@ + diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml index 406efe9..c276fd0 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -492,6 +492,7 @@ + @@ -2251,4 +2252,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 423a5cdeefc28e5085c9781a7e1f46bb4986519c Mon Sep 17 00:00:00 2001 From: Marissa Wall Date: Mon, 22 Jan 2018 13:13:29 -0800 Subject: 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: Id479c233dc7456420dc3da5a80dfe03c51caa906 --- .../base/core/res/res/xml/power_profile.xml | 137 +++++++++++---------- 1 file changed, 74 insertions(+), 63 deletions(-) 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 1fcf817..acc76e3 100644 --- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -15,13 +15,24 @@ - 6.957 + 6.957 - 2.855 + 2.855 + + + 17.757 + + + 6.478 + + 6.141 - + 300000 364800 441600 @@ -47,7 +58,7 @@ - + 300000 345600 422400 @@ -81,66 +92,66 @@ 2457600 - - - 92.451 - 93.158 - 93.997 - 94.915 - 95.686 - 96.295 - 97.031 - 97.804 - 99.095 - 100.005 - 101.407 - 102.484 - 104.247 - 106.340 - 107.756 - 109.728 - 110.122 - 112.570 - 117.837 - 130.354 - 133.134 - 137.809 + + + 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 - - - 102.305 - 103.782 - 106.156 - 109.347 - 111.951 - 114.418 - 118.203 - 119.348 - 123.105 - 125.068 - 127.789 - 130.686 - 135.918 - 138.613 - 142.436 - 148.186 - 154.753 - 160.137 - 164.933 - 172.082 - 181.209 - 201.205 - 205.762 - 229.152 - 244.584 - 296.146 - 314.341 - 334.633 - 344.553 - 351.063 - 347.850 + + + 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 -- cgit v1.2.3 From 4541e34f8f012f1be95248b5aa3759d4dc6d7690 Mon Sep 17 00:00:00 2001 From: Kumar Anand Date: Mon, 22 Jan 2018 15:05:36 -0800 Subject: wifi: enable Softap ACS and 11ac on Taimen Bug: 72228752 Bug: 72229084 Test: Wifi Regression Test Change-Id: Iccc644079236d9753176c0a66f2cbc39baa84d23 --- WCNSS_qcom_cfg.ini | 5 ----- overlay/frameworks/base/core/res/res/values/config.xml | 10 +++++++++- 2 files changed, 9 insertions(+), 6 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/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 60af8df..b7a7593 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -264,4 +264,12 @@ 12 - + + + true + + + true + + + -- cgit v1.2.3 From aab1fec575d4d1d0df011b26d13879073dcd745e Mon Sep 17 00:00:00 2001 From: Kumar Anand Date: Tue, 23 Jan 2018 13:24:58 -0800 Subject: wifi:taimen: 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: Ic7e885be36bc810c795ea6760b1fed4a3be17fcf --- 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 ############################################# -- cgit v1.2.3 From f71babf8ba0e1fb2477ae0bed30e6d77b1478e52 Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Wed, 24 Jan 2018 06:13:24 +0000 Subject: Revert "Audio V4: Split system and vendor Audio.h" This reverts commit eb6964a517a495053b2c7b737138b201993dbf55. Reason for revert: Breaks the build of multiple devices Change-Id: I04f4b79b9e4e12596cb9a875fcef626857e52b7e --- 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 c040c4d..d4b125a 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 -- cgit v1.2.3 From e20d9eda7cec80ed5d6fcba246dd1bd93dc69dcc Mon Sep 17 00:00:00 2001 From: Kumar Anand Date: Wed, 31 Jan 2018 12:21:12 -0800 Subject: 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: I98f18aa3373df4e5002daab88c97876e0defda4f --- 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 -- cgit v1.2.3 From b21c5e6054197db1d86b0a70b5647fc4ebc8b755 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Thu, 22 Feb 2018 16:50:39 +0100 Subject: overlay: rename status_bar_height to status_bar_height_portrait Bug: 73717865 Test: make droid Change-Id: Ief21178c9ce414978e49e038050faaff6418daa6 --- overlay/frameworks/base/core/res/res/values/dimens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/overlay/frameworks/base/core/res/res/values/dimens.xml index 93e3470..87a455b 100755 --- a/overlay/frameworks/base/core/res/res/values/dimens.xml +++ b/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -19,5 +19,5 @@ - 28dp + 28dp -- cgit v1.2.3 From 4db8e85edd440f534fca25d7d7b1361a0fe8224b Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Wed, 7 Mar 2018 14:27:34 +0000 Subject: Update the documentation for brightness configuration. This should always match the documentation in frameworks/base, since that's the canonical document. Bug: 74328541 Test: N/A Change-Id: I7b3266bb3c07631f13fe295ee883909ce24aff79 --- .../frameworks/base/core/res/res/values/config.xml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index b7a7593..d0831b0 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -26,14 +26,24 @@ http://www.gstatic.com/android/sms/G011C.xml - -- cgit v1.2.3 From fc150b9276ac3e41c3147496b2249a4366eb161d Mon Sep 17 00:00:00 2001 From: Phil Burk Date: Mon, 19 Mar 2018 14:17:12 -0700 Subject: aaudio: add MMAP mode for handset on Taimen 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: I185a10eaee37c74376dd7ffc574efb1d39aba5dd --- mixer_paths_tavil.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml index c276fd0..3332c2e 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -996,6 +996,10 @@ + + + + -- cgit v1.2.3 From bc9fafae2c8af1c00af47ca3940ecc31068bd98d Mon Sep 17 00:00:00 2001 From: Siddharth Ray Date: Tue, 20 Mar 2018 16:26:14 -0700 Subject: Power profile for T BUG:72383423 Change-Id: I63cd55dc163483abb65b913a43c6fa0408124147 --- .../base/core/res/res/xml/power_profile.xml | 25 ++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) 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 8fa56a5..31d0790 100644 --- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -177,11 +177,11 @@ 1 - 103 + 125 - 250 + 350 - 3800 + 3700 50 @@ -198,16 +198,23 @@ - 1 - 25 - 50 + 0 + 110 + 128 1 - 53 + 5 + 26 100 - 150 - 200 + 249 3700 + + + 32 + 4 + + 3700 + -- cgit v1.2.3 From 236aeb3665acd1509f1eb138382de0bd54772a02 Mon Sep 17 00:00:00 2001 From: Marissa Wall Date: Wed, 21 Mar 2018 09:53:35 -0700 Subject: power profile: Update taimen power profile Power profiles now support ambient and 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: I4be783bc3c075ac4a94ff8a2e82e144b43d7d331 --- .../base/core/res/res/xml/power_profile.xml | 36 +++++++--------------- 1 file changed, 11 insertions(+), 25 deletions(-) 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 31d0790..47b8f41 100644 --- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -1,9 +1,6 @@ - - - - 0 + 3520 @@ -168,39 +165,27 @@ minute. --> 831.870 - - 139.047 - - - 30 + + 21.29 + + 74.758 - + 1 125 350 - + 3700 - - 50 - - 5 - - - 6 - 5 - 4 - 3 - 3 - - 0 + 110 + 128 + 1 5 @@ -208,6 +193,7 @@ 100 249 + 3700 -- cgit v1.2.3 From 7367bc8f0b7456f187aa5f63f477755851e2b886 Mon Sep 17 00:00:00 2001 From: Marissa Wall Date: Wed, 21 Mar 2018 09:54:40 -0700 Subject: power profile: Add taimen bluetooth Add taimen bluetooth values. Fixes: 63738468 b/74126906 Test: Boot phone and dump BatteryStats Change-Id: If4576df3ac7e791b97cc0d7584dc7a8fe26b4c6a --- overlay/frameworks/base/core/res/res/xml/power_profile.xml | 9 +++++++++ 1 file changed, 9 insertions(+) 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 47b8f41..808bd03 100644 --- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -203,4 +203,13 @@ 3700 + + 0.01 + + 9 + + 7 + + 3300 + -- cgit v1.2.3 From 9f622ebd8e4b7b4bb7702b825a43d7eb9fa54540 Mon Sep 17 00:00:00 2001 From: Kumar Anand Date: Wed, 14 Mar 2018 14:40:21 -0700 Subject: 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: I4f2390f7234e5fdd0231d359d4c697ee8700f299 --- 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 -- cgit v1.2.3 From 7ad3ff54fdf737ca25afaa58a2d0f6388ce69a0b Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Mon, 26 Mar 2018 17:07:55 -0700 Subject: 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 -- cgit v1.2.3 From fa5074a487c8c1155a4e85290259934e015f8379 Mon Sep 17 00:00:00 2001 From: Eran Messeri Date: Tue, 27 Mar 2018 19:36:19 +0100 Subject: Indicate Taimen support Device ID attestation. Bug: 72642093 Bug: 73448533 Test: Modified CTS tests Change-Id: Ie6e26e1cde696fa5dea9e149102437525a39290d --- device.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device.mk b/device.mk index 1ccdda7..cffb431 100644 --- a/device.mk +++ b/device.mk @@ -99,6 +99,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/taimen/touchscreen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/touchscreen.idc +# Keymaster configuration +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml + # Enable modem logging ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PROPERTY_OVERRIDES += \ -- cgit v1.2.3 From 2867702c34d1a05caa3ac91d45b448e1a5717f80 Mon Sep 17 00:00:00 2001 From: Ahmed ElArabawy Date: Thu, 29 Mar 2018 09:10:52 -0700 Subject: WiFi: Switch wifi driver in wahoo into DLKM Current implementation for Taimen 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: I7c10296c2bc54e7a93e85464989030a1aa6fd7d7 Signed-off-by: Ahmed ElArabawy --- BoardConfig.mk | 24 ++++++++++++++++-------- init.insmod.cfg | 1 + 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 2dd594f..6e39bd2 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -33,55 +33,63 @@ BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/gcc/touch_core_base.ko \ device/google/wahoo-kernel/gcc/ftm4.ko \ device/google/wahoo-kernel/gcc/sw49408.ko \ - device/google/wahoo-kernel/gcc/lge_battery.ko + device/google/wahoo-kernel/gcc/lge_battery.ko \ + device/google/wahoo-kernel/gcc/wlan.ko else ifeq (,$(filter-out taimen_kasan, $(TARGET_PRODUCT))) # if TARGET_PRODUCT == taimen_kasan BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/kasan/touch_core_base.ko \ device/google/wahoo-kernel/kasan/ftm4.ko \ device/google/wahoo-kernel/kasan/sw49408.ko \ - device/google/wahoo-kernel/kasan/lge_battery.ko + device/google/wahoo-kernel/kasan/lge_battery.ko \ + device/google/wahoo-kernel/kasan/wlan.ko else ifeq (,$(filter-out taimen_kcfi, $(TARGET_PRODUCT))) # if TARGET_PRODUCT == taimen_kcfi BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/kcfi/touch_core_base.ko \ device/google/wahoo-kernel/kcfi/ftm4.ko \ device/google/wahoo-kernel/kcfi/sw49408.ko \ - device/google/wahoo-kernel/kcfi/lge_battery.ko + device/google/wahoo-kernel/kcfi/lge_battery.ko \ + device/google/wahoo-kernel/kcfi/wlan.ko else ifeq (,$(filter-out taimen_kernel_debug_memory, $(TARGET_PRODUCT))) # if TARGET == taimen_kernel_debug_memory BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/debug_memory/touch_core_base.ko \ device/google/wahoo-kernel/debug_memory/ftm4.ko \ device/google/wahoo-kernel/debug_memory/sw49408.ko \ - device/google/wahoo-kernel/debug_memory/lge_battery.ko + device/google/wahoo-kernel/debug_memory/lge_battery.ko \ + device/google/wahoo-kernel/debug_memory/wlan.ko else ifeq (,$(filter-out taimen_kernel_debug_locking, $(TARGET_PRODUCT))) # if TARGET == taimen_kernel_debug_locking BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/debug_locking/touch_core_base.ko \ device/google/wahoo-kernel/debug_locking/ftm4.ko \ device/google/wahoo-kernel/debug_locking/sw49408.ko \ - device/google/wahoo-kernel/debug_locking/lge_battery.ko + device/google/wahoo-kernel/debug_locking/lge_battery.ko \ + device/google/wahoo-kernel/debug_locking/wlan.ko else ifeq (,$(filter-out taimen_kernel_debug_hang, $(TARGET_PRODUCT))) # if TARGET == taimen_kernel_debug_hang BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/debug_hang/touch_core_base.ko \ device/google/wahoo-kernel/debug_hang/ftm4.ko \ device/google/wahoo-kernel/debug_hang/sw49408.ko \ - device/google/wahoo-kernel/debug_hang/lge_battery.ko + device/google/wahoo-kernel/debug_hang/lge_battery.ko \ + device/google/wahoo-kernel/debug_hang/wlan.ko else ifeq (,$(filter-out taimen_kernel_debug_api, $(TARGET_PRODUCT))) # if TARGET == taimen_kernel_debug_api BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/debug_api/touch_core_base.ko \ device/google/wahoo-kernel/debug_api/ftm4.ko \ device/google/wahoo-kernel/debug_api/sw49408.ko \ - device/google/wahoo-kernel/debug_api/lge_battery.ko + device/google/wahoo-kernel/debug_api/lge_battery.ko \ + device/google/wahoo-kernel/debug_api/wlan.ko else BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/touch_core_base.ko \ device/google/wahoo-kernel/ftm4.ko \ device/google/wahoo-kernel/sw49408.ko \ - device/google/wahoo-kernel/lge_battery.ko + device/google/wahoo-kernel/lge_battery.ko \ + device/google/wahoo-kernel/wlan.ko endif -include vendor/google_devices/taimen/proprietary/BoardConfigVendor.mk diff --git a/init.insmod.cfg b/init.insmod.cfg index 42a97a0..6fceef9 100644 --- a/init.insmod.cfg +++ b/init.insmod.cfg @@ -2,3 +2,4 @@ insmod /vendor/lib/modules/touch_core_base.ko insmod /vendor/lib/modules/ftm4.ko insmod /vendor/lib/modules/sw49408.ko insmod /vendor/lib/modules/lge_battery.ko +insmod /vendor/lib/modules/wlan.ko -- cgit v1.2.3 From d4629fd7fac935271330d0fb1affafa2bb8418f0 Mon Sep 17 00:00:00 2001 From: Ruchi Kandoi Date: Fri, 30 Mar 2018 14:39:33 -0700 Subject: libnfc-nxp.conf changes for NFC 1.1 Test: Nfc enabled/disabled; tag reading Bug: 75980364 Change-Id: I4dee2330b4ba7374cf5ebc3b101e3b07e6391fdf --- nfc/libnfc-nxp.taimen.conf | 313 +++++---------------------------------------- 1 file changed, 34 insertions(+), 279 deletions(-) diff --git a/nfc/libnfc-nxp.taimen.conf b/nfc/libnfc-nxp.taimen.conf index 23971fe..1411ac8 100644 --- a/nfc/libnfc-nxp.taimen.conf +++ b/nfc/libnfc-nxp.taimen.conf @@ -14,6 +14,7 @@ NXPLOG_NCIX_LOGLEVEL=0x01 NXPLOG_NCIR_LOGLEVEL=0x01 NXPLOG_FWDNLD_LOGLEVEL=0x01 NXPLOG_TML_LOGLEVEL=0x01 +NFC_DEBUG_ENABLED=0 ############################################################################### # 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 @@ -60,16 +59,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, @@ -205,12 +194,6 @@ NXP_RF_CONF_BLK_4={ 20, 02, 5B, 01, #NXP_RF_CONF_BLK_6={ #} -############################################################################### -# Set configuration optimization decision setting -# Enable = 0x01 -# Disable = 0x00 -NXP_SET_CONFIG_ALWAYS=0x00 - ############################################################################### # Core configuration extensions # It includes @@ -281,134 +264,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 -# host 0x00 -# eSE 0x01 -# UICC 0x02 -# UICC2 0x03 -DEFAULT_AID_ROUTE=0x00 - -############################################################################### -#Set the Mifare Desfire 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_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 +DEFAULT_SYS_CODE_ROUTE=0x00 ############################################################################### -#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 @@ -416,18 +286,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 @@ -442,133 +300,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 - -############################################################################### -# P61 JCOP OS download options -# FRAMEWORK API BY APPLICATION 0x00 -# AT BOOT_TIME 0x01 -NXP_JCOPDL_AT_BOOT_ENABLE=0x00 - -############################################################################### -# 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 +############################################################################## +# Extended APDU length for ISO_DEP +ISO_DEP_MAX_TRANSCEIVE=0xFEFF + +############################################################################### +# 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} + +############################################################################### +# 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 ############################################################################### -- cgit v1.2.3 From 70d5904310d5e739e19f14ce22987748cea3fa80 Mon Sep 17 00:00:00 2001 From: Kenny Guy Date: Tue, 3 Apr 2018 17:02:06 +0100 Subject: Update brightness curves for taimen 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: I2c92c2bfcc03ccaa07cab6d544913b52184667df --- .../frameworks/base/core/res/res/values/config.xml | 55 ++++++++++++++-------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index d0831b0..61999f4 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -47,15 +47,23 @@ 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 @@ -73,20 +81,27 @@ array. The brightness values must be non-negative and non-decreasing. This must be overridden in platform specific overlays --> - 13.25 - 54 - 78.85 - 105.02 - 132.7 - 170.12 - 212.1 - 265.2 - 335.8 - 415.2 - 478.5 + 7.702998 + 32.31226 + 38.786167 + 43.30993 + 46.851162 + 55.90478 + 61.334614 + 68.43880 + 75.59099 + 82.86860 + 91.49397 + 102.49851 + 118.81740 + 144.68486 + 180.69225 + 225.84135 + 292.46844 + 377.05084 + 481.93427 - 600 -- cgit v1.2.3 From 4b1dfe1fb0e0947dd9cdd3b0eaa15dd32d1c8781 Mon Sep 17 00:00:00 2001 From: Thierry Strudel Date: Tue, 3 Apr 2018 16:21:06 -0700 Subject: init-taimen.rc: map persist.vendor.charge.*.level to new driver nodes Bug: 75301885 Change-Id: I670d595a57754597aa7bfd514064897ec5e497e8 Signed-off-by: Thierry Strudel --- init-taimen.rc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/init-taimen.rc b/init-taimen.rc index 5ac3893..3fd4914 100644 --- a/init-taimen.rc +++ b/init-taimen.rc @@ -40,8 +40,11 @@ on property:sys.all.modules.ready=1 # Update touch firmware if required write /sys/devices/virtual/input/ftm4_touch/check_fw 1 -on property:sys.retaildemo.enabled=* && property:sys.all.modules.ready=1 - write /sys/module/lge_battery/parameters/demo_mode ${sys.retaildemo.enabled} - on property:ro.boot.hardware.display=2-1 setprop sys.display.low_persistence_mode_brightness 255 + +on property:persist.vendor.charge.stop.level=* && property:sys.all.modules.ready=1 + write /sys/module/lge_battery/parameters/charge_stop_level ${persist.vendor.charge.stop.level} + +on property:persist.vendor.charge.start.level=* && property:sys.all.modules.ready=1 + write /sys/module/lge_battery/parameters/charge_start_level ${persist.vendor.charge.start.level} -- cgit v1.2.3 From ec62c009a688d558b9319b108d48548789dedcc3 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Mon, 2 Apr 2018 15:38:39 -0700 Subject: Volume curves: alarm and a11y can't be muted Also rename "DEFAULT" curves to "TAIMEN_DEFAULT" to highlight the fact that these differ from the default curves in frameworks/av/services/audiopolicy/config/default_volume_tables.xml Bug: 72403580 Bug: 74985293 Test: try to mute alarms through UI and fail Change-Id: Ia07cf62a29eb62dca466a62f5befee6630343d67 --- audio_policy_volumes.xml | 58 +++++++++++++++++++++++------------------------ default_volume_tables.xml | 50 ++++++++++++++++++++++++++++++++-------- 2 files changed, 69 insertions(+), 39 deletions(-) diff --git a/audio_policy_volumes.xml b/audio_policy_volumes.xml index 5e3aa26..7519924 100644 --- a/audio_policy_volumes.xml +++ b/audio_policy_volumes.xml @@ -42,7 +42,7 @@ volume index from 0 to 100. 100,0 + ref="TAIMEN_DEFAULT_MEDIA_VOLUME_CURVE"/> 1,-3000 33,-2600 @@ -50,49 +50,49 @@ volume index from 0 to 100. 100,-1800 + ref="TAIMEN_DEFAULT_SYSTEM_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_SYSTEM_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/> 1,-5000 100,0 + ref="TAIMEN_DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_MEDIA_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_MEDIA_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_MEDIA_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/> - 1,-5000 + 0,-5000 100,0 + ref="TAIMEN_DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_NON_MUTABLE_EXT_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/> 1,-4000 100,0 + ref="TAIMEN_DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/> 0,-4200 33,-2800 @@ -112,7 +112,7 @@ volume index from 0 to 100. 100,0 + ref="TAIMEN_DEFAULT_MEDIA_VOLUME_CURVE"/> 1,-3000 33,-2600 @@ -120,11 +120,11 @@ volume index from 0 to 100. 100,-1800 + ref="TAIMEN_DEFAULT_SYSTEM_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_SYSTEM_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/> 1,-3000 33,-2600 @@ -132,11 +132,11 @@ volume index from 0 to 100. 100,-1800 + ref="TAIMEN_DEFAULT_SYSTEM_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_SYSTEM_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_NON_MUTABLE_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_NON_MUTABLE_SPEAKER_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_NON_MUTABLE_VOLUME_CURVE"/> + ref="TAIMEN_DEFAULT_NON_MUTABLE_VOLUME_CURVE"/> 0,-9600 100,-9600 - + 1,-2400 33,-1800 66,-1200 100,-600 - + 1,-5800 100,0 - - + + 1,-4950 33,-3350 66,-1700 100,0 - - + + 1,-5800 20,-4000 60,-1700 100,0 - - + + 1,-4950 33,-3350 66,-1700 100,0 - - + + 1,-5800 20,-4000 60,-2100 100,-1000 + + + + 0,-5800 + 20,-4000 + 60,-1700 + 100,0 + + + 0,-4950 + 33,-3350 + 66,-1700 + 100,0 + + + 0,-4950 + 33,-3350 + 66,-1700 + 100,0 + + + 0,-5800 + 20,-4000 + 60,-2100 + 100,-1000 + + + 0,-5800 + 100,0 + -- cgit v1.2.3 From f396e1aab88a339033ac7c6a79c336d6abf36c7a Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Tue, 3 Apr 2018 06:28:49 -0700 Subject: Add DEVICE_CATEGORY_HEARING_AID to audio_policy_volumes.xml Test: Use Hearing Aid on Taimen Bug: 69623109 Bug: 76434849 Change-Id: I40c7264097ccab0b2c12800d32c623a2d617324b --- audio_policy_volumes.xml | 28 +++++++++++++++++++++++++++- default_volume_tables.xml | 15 +++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/audio_policy_volumes.xml b/audio_policy_volumes.xml index 7519924..96b6306 100644 --- a/audio_policy_volumes.xml +++ b/audio_policy_volumes.xml @@ -43,6 +43,8 @@ volume index from 0 to 100. + 1,-3000 33,-2600 @@ -55,6 +57,8 @@ volume index from 0 to 100. ref="TAIMEN_DEFAULT_SYSTEM_VOLUME_CURVE"/> + @@ -65,6 +69,8 @@ volume index from 0 to 100. ref="TAIMEN_DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/> + + @@ -83,6 +91,8 @@ volume index from 0 to 100. ref="TAIMEN_DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/> + @@ -93,6 +103,8 @@ volume index from 0 to 100. ref="TAIMEN_DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/> + 0,-4200 33,-2800 @@ -113,6 +125,8 @@ volume index from 0 to 100. + 1,-3000 33,-2600 @@ -125,6 +139,8 @@ volume index from 0 to 100. ref="TAIMEN_DEFAULT_SYSTEM_VOLUME_CURVE"/> + 1,-3000 33,-2600 @@ -137,6 +153,8 @@ volume index from 0 to 100. ref="TAIMEN_DEFAULT_SYSTEM_VOLUME_CURVE"/> + + + + + - + diff --git a/default_volume_tables.xml b/default_volume_tables.xml index 55d0a5c..fff3ae0 100644 --- a/default_volume_tables.xml +++ b/default_volume_tables.xml @@ -65,6 +65,13 @@ 60,-2100 100,-1000 + + + 1,-12700 + 20,-8000 + 60,-4000 + 100,0 + @@ -95,5 +102,13 @@ 0,-5800 100,0 + + + + 0,-12700 + 20,-8000 + 60,-4000 + 100,0 + -- cgit v1.2.3 From b356d7f4e30c7651f6a0df4ed23f5271210672de Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Wed, 4 Apr 2018 17:27:54 +0200 Subject: Enable early phase offsets for Taimen Since we hit GL comp quite frequently during app transitions, we need to enable early phase offsets to give it enough time for composition. Test: Open app, make sure vsync-offsets shift Bug: 75985430 Change-Id: I2f85bf72a4b135dce664f7274848f3956a9aaf7a --- device.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device.mk b/device.mk index cffb431..30cd3dd 100644 --- a/device.mk +++ b/device.mk @@ -126,3 +126,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ persist.traced.enable=1 +# Early phase offset for SurfaceFlinger (b/75985430) +PRODUCT_PROPERTY_OVERRIDES += \ + debug.sf.early_phase_offset_ns=5000000 + -- cgit v1.2.3 From 5e125bab59c4552129eed95e85eca1e09eafb0e1 Mon Sep 17 00:00:00 2001 From: Qingxi Li Date: Wed, 11 Apr 2018 11:07:07 -0700 Subject: 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: 77707568 Test: E2E Change-Id: I15f2bc15f33d07a1471e20384aa92dfcfe88e5dd --- device.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device.mk b/device.mk index 30cd3dd..aa774a1 100644 --- a/device.mk +++ b/device.mk @@ -70,6 +70,9 @@ 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 += \ frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml -- cgit v1.2.3 From d80f91e2049241c53cced075f5774f3bccce7467 Mon Sep 17 00:00:00 2001 From: Kumar Anand Date: Thu, 12 Apr 2018 13:12:27 -0700 Subject: wifi: update ini configuration file Bug:77605159 Test: Wifi Manual Sanity Test Change-Id: I4728ffc76f130a91b193975a53af0b53cd9cfb4f --- WCNSS_qcom_cfg.ini | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini index 185e4c2..c61ffc6 100644 --- a/WCNSS_qcom_cfg.ini +++ b/WCNSS_qcom_cfg.ini @@ -90,6 +90,10 @@ gTxChainMask1ss=0 gSelfGenFrmPwr=3 gReportMaxLinkSpeed=0 + +# Use OEM provisioned MAC address +enable_mac_provision=1 + ################ NAN feature set start ################### # Enable or Disable NAN # 1=Enable (default), 0=Disable @@ -139,6 +143,9 @@ gTxBFEnable=1 gSetTxChainmask1x1=1 gSetRxChainmask1x1=1 +# 2.4GHz Antenna Sharing is not supported +gForce1x1Exception=0 + #If set to 0, MCC is not allowed. gEnableMCCMode=1 @@ -223,10 +230,6 @@ gEnableIpTcpUdpChecksumOffload=1 # 1 - enable 0 - disable TSOEnable=0 -# Enable Large Recieve Offload -# 1 - enable(default) 0 - disable -LROEnable=1 - # Enable HT MPDU Density # 4 for 2 micro sec ght_mpdu_density=4 @@ -241,6 +244,12 @@ ce_service_max_yield_time=500 ce_service_max_rx_ind_flush=1 maxMSDUsPerRxInd=8 +# Data Stall Debugging feature +gEnableDataStallDetection=0 + +# Dynamic configuration of TCP limit output bytes +gTcpLimitOutputEnable=0 + ################ Datapath feature set End ################ ############################################# @@ -309,7 +318,7 @@ g_probe_req_ie_bitmap_0=0x0000000B # g_probe_req_ie_bitmap_3=0x00000000 # g_probe_req_ie_bitmap_4=0x00000000 # g_probe_req_ie_bitmap_5=0x00000000 -# g_probe_req_ie_bitmap_6=0x00000000 +g_probe_req_ie_bitmap_6=0x20000000 # g_probe_req_ie_bitmap_7=0x00000000 ############################################# @@ -366,7 +375,6 @@ EseEnabled=1 gNeighborLookupThreshold=76 gNeighborReassocThreshold=81 -gNeighborScanTimerPeriod=200 gNeighborScanChannelMinTime=20 gNeighborScanChannelMaxTime=30 gMaxNeighborReqTries=3 @@ -404,6 +412,9 @@ gRoamOffloadEnabled=1 gAllowDFSChannelRoam=1 +# LFR Subnet Detection +gLFRSubnetDetectionEnable=0 + ############################################# # Offload related configurations ############################################# @@ -454,6 +465,8 @@ gHwFilterMode=0 # Default value of gEnableWoW is 3. # gEnableWoW=0 +# 11k feature offload +11k_offload_enable_bitmask=0 ############################################# # Logging related configurations @@ -585,8 +598,6 @@ gSapSccChanAvoidance=0 #Enable/Disable Tx beamformee in SAP mode gEnableTxBFeeSAP=1 - - #Enable/Disable dual MAC feature # 0 - enable DBS # 1 - disable DBS @@ -632,6 +643,24 @@ mawc_nlo_enabled=0 # Enable/Disable rtt sta mac randomization enable_rtt_mac_randomization=1 +# Channel selection logic DBS (1) vs MCC (0) +channel_select_logic_conc=0 + +gConfigVCmode=0 + +# WLM (Wireless Latency Manager) +wlm_latency_flags_moderate=0 +wlm_latency_flags_low=0 +wlm_latency_flags_ultralow=0 + +# OCE Feature +oce_sta_enable=0 +oce_sap_enable=0 +num_oce_wan_slots=0 +oce_wan_score_idx7_to_4=0 +oce_wan_score_idx11_to_8=0 +oce_enable_rssi_assoc_reject=0 + END # Note: Configuration parser would not read anything past the END marker -- cgit v1.2.3 From 1ec2484c83ab2b166e6715ed6e1d95837137a841 Mon Sep 17 00:00:00 2001 From: jiabin Date: Fri, 13 Apr 2018 16:18:28 -0700 Subject: Add fake mic info for taimen. AudioManagerTest.testGetMicrophones failed on taimen due to no microphones data. Adding fake data right now to pass the CTS and update with actual data once we get it. Bug: 64038649 Bug: 77983724 Test: run cts Change-Id: I4446b38285803cfe04905a870838f1a24df08585 --- 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 7b33970..e4b6839 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -99,6 +99,15 @@ + + + + + -- cgit v1.2.3 From b8514ec11588c94412a93948ee7ccc66d6d19167 Mon Sep 17 00:00:00 2001 From: Santos Cordon Date: Fri, 13 Apr 2018 16:36:38 -0700 Subject: Set the default and minimum values for taimen's VR brightness. Test: Ensure going into VR still sets the brightness to 140. Change-Id: I1f65f766d9deba465fdad960d61b9df4db803eb0 Bug: 73090564 --- overlay/frameworks/base/core/res/res/values/config.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 61999f4..bab33e2 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -120,8 +120,11 @@ Must be in the range specified by minimum and maximum. --> 98 - - 86 + + 140 + + + 140 @@ -295,6 +298,4 @@ true - - -- cgit v1.2.3 From 4184969240ebbddc214bb87595209ffa1cced690 Mon Sep 17 00:00:00 2001 From: David Lin Date: Tue, 17 Apr 2018 10:27:26 -0700 Subject: haptics: Specify playback duration for heavy click This patch specifies the playback duration to 12 ms for a heavy click effect. Bug: 77863933 Test: manual long press test Change-Id: I625eacc631b639f161fcddd179623ef8a89db3e1 Signed-off-by: David Lin --- device.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index aa774a1..6335298 100644 --- a/device.mk +++ b/device.mk @@ -123,7 +123,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Vibrator HAL PRODUCT_PROPERTY_OVERRIDES += \ ro.vibrator.hal.click.duration=10 \ - ro.vibrator.hal.tick.duration=4 + ro.vibrator.hal.tick.duration=4 \ + ro.vibrator.hal.heavyclick.duration=12 # Enable Perfetto traced PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ -- cgit v1.2.3 From f1d302a065b7fafa5fe0c203062c7b231783bd36 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Wed, 18 Apr 2018 10:03:56 -0700 Subject: audio mixer paths: add missing init values for mmap path Bug: 65378324 Test: repro steps in bug Test: CTS test AAudioTest Change-Id: I2934dc425eef1d1bb564ffabf1a0fe09786b7e09 --- 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 3332c2e..920552c 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -200,7 +200,6 @@ - @@ -615,6 +614,13 @@ + + + + + + + -- cgit v1.2.3 From cda8d25911f04460b5b0d092ca2ca19b17f5fd95 Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Thu, 19 Apr 2018 10:15:16 -0700 Subject: Fix Hearing Aid microphone not working during phone call Bug: 77634055 Test: make phone call, use microphone Change-Id: If53342c3e787ba8ee303e72cabcd27b62076a4c3 --- audio_platform_info_tavil.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml index e4b6839..227b3f1 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -59,6 +59,7 @@ + -- cgit v1.2.3 From f0ac9818715525ba8be171966dfa02c3e2373098 Mon Sep 17 00:00:00 2001 From: rago Date: Thu, 19 Apr 2018 15:36:03 -0700 Subject: Dynamics Processing Effect Dynamics Processing configuration Bug: 64161702 Bug: 38266419 Test: manual and CTS testing Change-Id: I097a89660841e6dcfa440a4f3f94a008bbcf1af7 --- audio_effects.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/audio_effects.xml b/audio_effects.xml index f22bf51..ed6ad27 100644 --- a/audio_effects.xml +++ b/audio_effects.xml @@ -6,6 +6,7 @@ + @@ -55,6 +56,7 @@ + -- cgit v1.2.3 From 4ef5fbdbc678bdfe204bbc4867d5f3ddc6833e53 Mon Sep 17 00:00:00 2001 From: Kumar Anand Date: Thu, 3 May 2018 14:39:55 -0700 Subject: wifi: Re-enable TSO TCP Segmentation Offload (TSO) is re-enabled to meet TCP TX (UL) throughput. Bug: 78503031 Test: Performance Test Change-Id: I96c3609995c685d9dc363268132fc5f383d6d211 --- 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 -- cgit v1.2.3 From 11c5a0eac71ba3d80fa66ef32fb07339bf8ef162 Mon Sep 17 00:00:00 2001 From: jiabin Date: Thu, 3 May 2018 15:20:14 -0700 Subject: Add actual data for microphone characteristics. Bug: 75041465 Test: run cts Change-Id: I391b7af81cb758c60dc39a1c286fc288de7de56d --- 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 227b3f1..17b466e 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -100,14 +100,17 @@ - + group="0" index_in_the_group="0" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="93" + frequencies="100.00 106.00 112.00 118.00 125.00 132.00 140.00 150.00 160.00 170.00 180.00 190.00 200.00 212.00 224.00 236.00 250.00 265.00 280.00 300.00 315.00 335.00 355.00 375.00 400.00 425.00 450.00 475.00 500.00 530.00 560.00 600.00 630.00 670.00 710.00 750.00 800.00 850.00 900.00 950.00 1000.00 1060.00 1120.00 1180.00 1250.00 1320.00 1400.00 1500.00 1600.00 1700.00 1800.00 1900.00 2000.00 2120.00 2240.00 2360.00 2500.00 2650.00 2800.00 3000.00 3150.00 3350.00 3550.00 3750.00 4000.00 4250.00 4500.00 4750.00 5000.00 5300.00 5600.00 6000.00 6300.00 6700.00 7100.00 7500.00 8000.00 8500.00 9000.00 9500.00 10000.00 10600.00 11200.00 11800.00 12500.00 13200.00 14000.00 15000.00 16000.00 17000.00 18000.00 19000.00 20000.00" + responses="-0.98 -0.95 -0.89 -0.85 -0.81 -0.79 -0.77 -0.74 -0.71 -0.68 -0.66 -0.66 -0.63 -0.60 -0.57 -0.54 -0.53 -0.50 -0.50 -0.48 -0.46 -0.46 -0.41 -0.38 -0.33 -0.30 -0.34 -0.31 -0.29 -0.26 -0.23 -0.19 -0.17 -0.14 -0.11 -0.08 -0.05 -0.03 0.00 0.01 0.00 0.03 0.03 0.08 0.12 0.16 0.18 0.19 0.30 0.39 0.49 0.56 0.63 0.82 0.83 0.84 0.83 0.93 0.99 1.24 1.50 1.76 2.00 2.05 2.36 2.63 2.71 2.73 3.00 3.12 3.28 4.61 5.23 7.94 7.00 7.88 8.87 9.95 11.41 12.67 13.87 17.63 17.87 18.83 23.27 27.86 38.70 36.74 31.66 25.61 27.23 19.68 16.12" + sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 0.0 1.0" geometric_location="0.02635 0.00454 0.00794" /> + group="0" index_in_the_group="1" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="93" + frequencies="100.00 106.00 112.00 118.00 125.00 132.00 140.00 150.00 160.00 170.00 180.00 190.00 200.00 212.00 224.00 236.00 250.00 265.00 280.00 300.00 315.00 335.00 355.00 375.00 400.00 425.00 450.00 475.00 500.00 530.00 560.00 600.00 630.00 670.00 710.00 750.00 800.00 850.00 900.00 950.00 1000.00 1060.00 1120.00 1180.00 1250.00 1320.00 1400.00 1500.00 1600.00 1700.00 1800.00 1900.00 2000.00 2120.00 2240.00 2360.00 2500.00 2650.00 2800.00 3000.00 3150.00 3350.00 3550.00 3750.00 4000.00 4250.00 4500.00 4750.00 5000.00 5300.00 5600.00 6000.00 6300.00 6700.00 7100.00 7500.00 8000.00 8500.00 9000.00 9500.00 10000.00 10600.00 11200.00 11800.00 12500.00 13200.00 14000.00 15000.00 16000.00 17000.00 18000.00 19000.00 20000.00" + responses="-0.95 -0.91 -0.87 -0.84 -0.79 -0.77 -0.76 -0.75 -0.71 -0.67 -0.65 -0.63 -0.61 -0.61 -0.59 -0.56 -0.56 -0.53 -0.51 -0.50 -0.49 -0.46 -0.45 -0.41 -0.41 -0.37 -0.33 -0.32 -0.30 -0.28 -0.24 -0.23 -0.20 -0.19 -0.15 -0.15 -0.12 -0.09 -0.04 -0.01 0.00 0.02 0.05 0.11 0.14 0.19 0.23 0.31 0.44 0.52 0.63 0.69 0.75 0.84 1.22 1.19 1.13 1.20 1.27 1.36 1.40 1.56 1.65 1.88 1.99 2.11 2.33 2.54 2.89 3.15 3.35 4.08 4.99 5.38 5.05 5.54 6.44 6.66 10.40 8.75 8.47 9.10 8.62 16.96 14.69 16.88 19.24 25.51 29.41 42.32 31.65 33.96 25.48" + sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 0.0 1.0" geometric_location="0.05034 0.15409 0.00794" /> -- cgit v1.2.3 From 62a9ac6097fb3886f22948a8d8e933651010e664 Mon Sep 17 00:00:00 2001 From: jiabin Date: Wed, 9 May 2018 17:07:00 -0700 Subject: 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: Id4498643f449e80544151b29ef3af4efa8b5ac4b --- 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 17b466e..91b2dd1 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -109,9 +109,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 559128b1c97c509e6adaeac18254317bf86e4e96 Mon Sep 17 00:00:00 2001 From: Siddharth Ray Date: Wed, 16 May 2018 15:11:27 -0700 Subject: Taimen connectivity power profile Cellular, Wifi and GPS power profile for Taimen is updated to values based on device power measurements. BUG:79879615 Change-Id: I846b05277b264375d18d5a4451e14a1060743553 --- .../base/core/res/res/xml/power_profile.xml | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) 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 808bd03..b9ab9f3 100644 --- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -171,35 +171,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 -- cgit v1.2.3 From b75cd81dfc4b320d8985e2876914291689ca5cea Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 16 May 2018 18:25:04 -0700 Subject: taimen: 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 ############################################# -- cgit v1.2.3 From e76a6ff6f20a53681da7d43dbae1f2f22d8c83ae Mon Sep 17 00:00:00 2001 From: juyuchen Date: Tue, 22 May 2018 17:35:57 +0800 Subject: audio: update table : add bt-sco and speaker-safe path Bug: 78257659 Test: manual audio test on M2 Change-Id: If17a4a0451891185fd7e6a073b9cc29c0ea6a7a5 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 91b2dd1..846e305 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -86,7 +86,9 @@ + + diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml index 920552c..46c5a68 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -1861,6 +1861,26 @@ + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 114c1678340f426961937ef1ad14de86ecca9502 Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Wed, 23 May 2018 16:57:42 -0700 Subject: Removing feature location_network from aosp_taimen A location provider is absent on device without vendor blobs so the feature should not be present. Test: lunch aosp_taimen-userdebug, build, flash, then atest android.app.cts.SystemFeaturesTest Bug: 33380753 Change-Id: Ia889c8ec41e1f219b20b7a18299d79d0f1a79c45 --- aosp_taimen.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aosp_taimen.mk b/aosp_taimen.mk index fa46a05..5f2c414 100644 --- a/aosp_taimen.mk +++ b/aosp_taimen.mk @@ -30,7 +30,8 @@ PRODUCT_PACKAGES += \ vndk_package PRODUCT_COPY_FILES += \ - device/google/taimen/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml + device/google/taimen/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 -- cgit v1.2.3 From 078b660460fdfafe9b03f1c4971530edda1dd842 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Tue, 29 May 2018 10:57:23 +0800 Subject: taimen: fix voip on voice-hac-handset 1. add voip/playback path for voice-hac-handset 2. clean up below error 05-29 10:50:06.501 747 1309 E audio_route: unable to find sub path 'bt-sco-headset' 05-29 10:50:06.501 747 1309 E audio_route: unable to find sub path 'bt-sco-headset-wb' 05-29 10:50:06.501 747 1309 E audio_route: unable to find sub path 'bt-sco-headset' 05-29 10:50:06.501 747 1309 E audio_route: unable to find sub path 'bt-sco-headset-wb' 3. fix btsco path for mmap-playback Bug: 79728803 Test: enable HAC in VOIP call and no error log Change-Id: I6c85315a39d505b09d6ed9f900ead17dc78e0084 Signed-off-by: Carter Hsu --- mixer_paths_tavil.xml | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml index 46c5a68..1151590 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -886,6 +886,10 @@ + + + + @@ -940,6 +944,10 @@ + + + + @@ -1006,17 +1014,21 @@ + + + + - + - + @@ -1861,6 +1873,12 @@ + + + + + + @@ -1881,15 +1899,9 @@ - - - - - - @@ -2118,6 +2130,10 @@ + + + + -- cgit v1.2.3 From e1b77e9c264806c2d6200e28b289522f52d433a0 Mon Sep 17 00:00:00 2001 From: Shawn Yang Date: Thu, 31 May 2018 17:59:43 -0700 Subject: 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: Iae10d6d301f9f22668c8cef57ee0f286225c8046 --- AndroidBoard.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 AndroidBoard.mk diff --git a/AndroidBoard.mk b/AndroidBoard.mk new file mode 100644 index 0000000..006fe5c --- /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/taimen/proprietary/AndroidBoardVendor.mk -- cgit v1.2.3 From 83a4163a251bf324584856253dd2cb34efcaeb2d Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 29 May 2018 16:17:14 -0700 Subject: Changing the default launcher and recents implementation for aosp build Bug: 77490347 Test: Build and flashed system image Change-Id: Ib5e8a3cb0c8fec727b310b79e75f94c1de0fdb8b --- aosp_taimen.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aosp_taimen.mk b/aosp_taimen.mk index 5f2c414..5653fd5 100644 --- a/aosp_taimen.mk +++ b/aosp_taimen.mk @@ -24,7 +24,7 @@ $(call inherit-product-if-exists, vendor/google_devices/taimen/proprietary/devic PRODUCT_PACKAGES += \ Dialer \ - Launcher3 \ + Launcher3QuickStep \ WallpaperPicker \ netutils-wrapper-1.0 \ vndk_package -- cgit v1.2.3 From af1cb8d0a2ece5acded6f5ccf51a79af3577ad42 Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Tue, 5 Jun 2018 15:23:29 -0700 Subject: Revert "Switch to deadline IO scheduler post boot." This reverts commit 5e3069df106f86d819e479c4ecff61e0b31f6440. Test: boots bug: 63630139 Change-Id: I39b0c46ac881e06c4ec276db1cb4c4d8cea53821 --- init-taimen.rc | 2 -- 1 file changed, 2 deletions(-) diff --git a/init-taimen.rc b/init-taimen.rc index 3fd4914..14c5fc0 100644 --- a/init-taimen.rc +++ b/init-taimen.rc @@ -23,8 +23,6 @@ on property:sys.boot_completed=1 write /sys/block/sde/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 boot # Allow ftm4 autotune from adb shell -- cgit v1.2.3