From 380c525541ab3b2261560dca6a96f8fb2c34ec9c Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 8 Mar 2022 06:12:14 +0000 Subject: [PATCH 01/30] Update oriole SVN to 25 Bug: 223313197 Change-Id: Iff092322df7a366281dcf89d8c9987064b6347f8 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index cee0836..ff4015b 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -175,7 +175,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=24 + ro.vendor.build.svn=25 # Hide cutout overlays PRODUCT_PACKAGES += \ From ba9024c7802357ae2da0b6ae6a9d889544611f03 Mon Sep 17 00:00:00 2001 From: Lais Andrade Date: Mon, 7 Mar 2022 22:49:17 +0000 Subject: [PATCH 02/30] Revert notification patterns to default pre-S ones [DO NOT MERGE] Bug: 210535717 Test: manual Change-Id: I6ead011f1cc28ea0c061941ab1665ed8250c3784 --- .../base/core/res/res/values/config.xml | 82 ------------------- .../base/core/res/res/values/config.xml | 82 ------------------- 2 files changed, 164 deletions(-) diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index d93eb1f..6eec9d0 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -227,88 +227,6 @@ non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. --> 50 - - - 0.0 - -0.85 - 0.0 - - 0.4 - -0.25 - 100.0 - - 0.4 - -0.25 - 100.0 - - 0.0 - -0.85 - 100.0 - - 0.0 - -0.85 - 100.0 - - 0.4 - -0.25 - 100.0 - - 0.4 - -0.25 - 100.0 - - 0.0 - -0.85 - 100.0 - - - - - 0.0 - -0.85 - 0.0 - - 0.4 - -0.25 - 50.0 - - 0.4 - -0.25 - 100.0 - - 0.0 - -0.85 - 50.0 - - 0.0 - -0.85 - 100.0 - - 0.4 - -0.25 - 50.0 - - 0.4 - -0.25 - 100.0 - - 0.0 - -0.85 - 50.0 - - 64 diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index cffd560..a83a4e4 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -195,88 +195,6 @@ non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. --> 50 - - - 0.0 - -0.85 - 0.0 - - 0.4 - -0.25 - 100.0 - - 0.4 - -0.25 - 100.0 - - 0.0 - -0.85 - 100.0 - - 0.0 - -0.85 - 100.0 - - 0.4 - -0.25 - 100.0 - - 0.4 - -0.25 - 100.0 - - 0.0 - -0.85 - 100.0 - - - - - 0.0 - -0.85 - 0.0 - - 0.4 - -0.25 - 50.0 - - 0.4 - -0.25 - 100.0 - - 0.0 - -0.85 - 50.0 - - 0.0 - -0.85 - 100.0 - - 0.4 - -0.25 - 50.0 - - 0.4 - -0.25 - 100.0 - - 0.0 - -0.85 - 50.0 - - From 25c80c8cca56c06932e4ef3d93be94aab7479a93 Mon Sep 17 00:00:00 2001 From: Lais Andrade Date: Tue, 8 Mar 2022 12:05:36 +0000 Subject: [PATCH 03/30] Update notification PWLE patterns to a higher frequency range Make pattern vibrate on a higher frequency range to increase the overall vibration intensity and make the notification vibration more noisy when the phone is on a solid surface, to address user feedback. Bug: 210535717 Test: manual Change-Id: Ic7d97d35e271b23e34dde8afb92dfcee29e7563a --- .../base/core/res/res/values/config.xml | 48 +++++++++---------- .../base/core/res/res/values/config.xml | 48 +++++++++---------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index 0b63462..ed02d61 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -236,35 +236,35 @@ --> 0.0 - 60.0 + 160.0 0.0 - 0.4 - 120.0 + 0.24 + 200.0 100.0 - 0.4 - 120.0 + 0.24 + 200.0 100.0 0.0 - 60.0 + 160.0 100.0 0.0 - 60.0 + 160.0 100.0 - 0.4 - 120.0 + 0.24 + 200.0 100.0 - 0.4 - 120.0 + 0.24 + 200.0 100.0 0.0 - 60.0 + 160.0 100.0 @@ -277,35 +277,35 @@ --> 0.0 - 60.0 + 160.0 0.0 - 0.4 - 120.0 + 0.24 + 200.0 50.0 - 0.4 - 120.0 + 0.24 + 200.0 100.0 0.0 - 60.0 + 160.0 50.0 0.0 - 60.0 + 160.0 100.0 - 0.4 - 120.0 + 0.24 + 200.0 50.0 - 0.4 - 120.0 + 0.24 + 200.0 100.0 0.0 - 60.0 + 160.0 50.0 diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 36b7fdf..966332c 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -204,35 +204,35 @@ --> 0.0 - 60.0 + 160.0 0.0 - 0.4 - 120.0 + 0.24 + 200.0 100.0 - 0.4 - 120.0 + 0.24 + 200.0 100.0 0.0 - 60.0 + 160.0 100.0 0.0 - 60.0 + 160.0 100.0 - 0.4 - 120.0 + 0.24 + 200.0 100.0 - 0.4 - 120.0 + 0.24 + 200.0 100.0 0.0 - 60.0 + 160.0 100.0 @@ -245,35 +245,35 @@ --> 0.0 - 60.0 + 160.0 0.0 - 0.4 - 120.0 + 0.24 + 200.0 50.0 - 0.4 - 120.0 + 0.24 + 200.0 100.0 0.0 - 60.0 + 160.0 50.0 0.0 - 60.0 + 160.0 100.0 - 0.4 - 120.0 + 0.24 + 200.0 50.0 - 0.4 - 120.0 + 0.24 + 200.0 100.0 0.0 - 60.0 + 160.0 50.0 From 4cdaad59985865a44da516b03baaa2caa17b7dc4 Mon Sep 17 00:00:00 2001 From: justinweng Date: Tue, 25 Jan 2022 15:45:21 +0800 Subject: [PATCH 04/30] DO NOT MERGE audio: add immersive output Bug: 189423448 Test: build passed. Signed-off-by: justinweng Change-Id: I0a14bd264fb79f56698ab626bd71af7f72e9fff8 --- .../config/audio_platform_configuration.xml | 1 + .../oriole/config/audio_policy_configuration.xml | 16 ++++++++++------ ...olicy_configuration_a2dp_offload_disabled.xml | 10 +++++++--- audio/oriole/config/mixer_paths.xml | 12 ++++++++++++ .../config/audio_platform_configuration.xml | 1 + .../raven/config/audio_policy_configuration.xml | 16 ++++++++++------ ...olicy_configuration_a2dp_offload_disabled.xml | 10 +++++++--- audio/raven/config/mixer_paths.xml | 12 ++++++++++++ 8 files changed, 60 insertions(+), 18 deletions(-) diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml index 6bc6159..f8cd663 100644 --- a/audio/oriole/config/audio_platform_configuration.xml +++ b/audio/oriole/config/audio_platform_configuration.xml @@ -182,6 +182,7 @@ + diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index 90ee1c3..8d732a1 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -63,6 +63,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + + + + + + + + + diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml index 6bc6159..f8cd663 100644 --- a/audio/raven/config/audio_platform_configuration.xml +++ b/audio/raven/config/audio_platform_configuration.xml @@ -182,6 +182,7 @@ + diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index 90ee1c3..8d732a1 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -63,6 +63,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + + + + + + + + + From 809f946cedddfcd56661c361a94778929905960e Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Thu, 16 Sep 2021 15:58:09 +0200 Subject: [PATCH 05/30] DO NOT MERGE Audio configuration for spatial audio Update audio policy and effect configuration files to support spatial audio feature Bug: 189423448 Test: make Change-Id: I2274fb4784eef5e28cadd9f33c38fdbbe60f6b40 --- audio/oriole/audio-tables.mk | 3 +- audio/oriole/config/audio_effects.xml | 2 + ...uetooth_audio_policy_configuration_7_0.xml | 44 +++++++++++++++++++ audio/raven/audio-tables.mk | 3 +- audio/raven/config/audio_effects.xml | 2 + ...uetooth_audio_policy_configuration_7_0.xml | 44 +++++++++++++++++++ 6 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml create mode 100644 audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml diff --git a/audio/oriole/audio-tables.mk b/audio/oriole/audio-tables.mk index 52e4858..abbf589 100644 --- a/audio/oriole/audio-tables.mk +++ b/audio/oriole/audio-tables.mk @@ -23,7 +23,8 @@ PRODUCT_COPY_FILES += \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml + device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/oriole/config/audio_effects.xml b/audio/oriole/config/audio_effects.xml index 1718057..e35bfbd 100644 --- a/audio/oriole/config/audio_effects.xml +++ b/audio/oriole/config/audio_effects.xml @@ -10,6 +10,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml b/audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml new file mode 100644 index 0000000..3a07ded --- /dev/null +++ b/audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/raven/audio-tables.mk b/audio/raven/audio-tables.mk index b79674e..f2fc29a 100644 --- a/audio/raven/audio-tables.mk +++ b/audio/raven/audio-tables.mk @@ -23,7 +23,8 @@ PRODUCT_COPY_FILES += \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml + device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/raven/config/audio_effects.xml b/audio/raven/config/audio_effects.xml index 1718057..e35bfbd 100644 --- a/audio/raven/config/audio_effects.xml +++ b/audio/raven/config/audio_effects.xml @@ -10,6 +10,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml b/audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml new file mode 100644 index 0000000..3a07ded --- /dev/null +++ b/audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d91acaba1ad0d0350dcd1e18d9fdddff514a9970 Mon Sep 17 00:00:00 2001 From: justinweng Date: Tue, 25 Jan 2022 15:45:21 +0800 Subject: [PATCH 06/30] DO NOT MERGE audio: add immersive output Bug: 189423448 Test: build passed. Signed-off-by: justinweng Change-Id: I0a14bd264fb79f56698ab626bd71af7f72e9fff8 --- .../config/audio_platform_configuration.xml | 1 + .../oriole/config/audio_policy_configuration.xml | 16 ++++++++++------ ...olicy_configuration_a2dp_offload_disabled.xml | 10 +++++++--- audio/oriole/config/mixer_paths.xml | 12 ++++++++++++ .../config/audio_platform_configuration.xml | 1 + .../raven/config/audio_policy_configuration.xml | 16 ++++++++++------ ...olicy_configuration_a2dp_offload_disabled.xml | 10 +++++++--- audio/raven/config/mixer_paths.xml | 12 ++++++++++++ 8 files changed, 60 insertions(+), 18 deletions(-) diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml index 6bc6159..f8cd663 100644 --- a/audio/oriole/config/audio_platform_configuration.xml +++ b/audio/oriole/config/audio_platform_configuration.xml @@ -182,6 +182,7 @@ + diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index 90ee1c3..8d732a1 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -63,6 +63,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + + + + + + + + + diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml index 6bc6159..f8cd663 100644 --- a/audio/raven/config/audio_platform_configuration.xml +++ b/audio/raven/config/audio_platform_configuration.xml @@ -182,6 +182,7 @@ + diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index 90ee1c3..8d732a1 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -63,6 +63,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + + + + + + + + + From edfc5e86bde0ea87e286047161f8ee3e1a022303 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Thu, 16 Sep 2021 15:58:09 +0200 Subject: [PATCH 07/30] DO NOT MERGE Audio configuration for spatial audio Update audio policy and effect configuration files to support spatial audio feature Bug: 189423448 Test: make Change-Id: I2274fb4784eef5e28cadd9f33c38fdbbe60f6b40 --- audio/oriole/audio-tables.mk | 3 +- audio/oriole/config/audio_effects.xml | 2 + ...uetooth_audio_policy_configuration_7_0.xml | 44 +++++++++++++++++++ audio/raven/audio-tables.mk | 3 +- audio/raven/config/audio_effects.xml | 2 + ...uetooth_audio_policy_configuration_7_0.xml | 44 +++++++++++++++++++ 6 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml create mode 100644 audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml diff --git a/audio/oriole/audio-tables.mk b/audio/oriole/audio-tables.mk index 52e4858..abbf589 100644 --- a/audio/oriole/audio-tables.mk +++ b/audio/oriole/audio-tables.mk @@ -23,7 +23,8 @@ PRODUCT_COPY_FILES += \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml + device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/oriole/config/audio_effects.xml b/audio/oriole/config/audio_effects.xml index 1718057..e35bfbd 100644 --- a/audio/oriole/config/audio_effects.xml +++ b/audio/oriole/config/audio_effects.xml @@ -10,6 +10,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml b/audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml new file mode 100644 index 0000000..3a07ded --- /dev/null +++ b/audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/raven/audio-tables.mk b/audio/raven/audio-tables.mk index b79674e..f2fc29a 100644 --- a/audio/raven/audio-tables.mk +++ b/audio/raven/audio-tables.mk @@ -23,7 +23,8 @@ PRODUCT_COPY_FILES += \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml + device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/raven/config/audio_effects.xml b/audio/raven/config/audio_effects.xml index 1718057..e35bfbd 100644 --- a/audio/raven/config/audio_effects.xml +++ b/audio/raven/config/audio_effects.xml @@ -10,6 +10,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml b/audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml new file mode 100644 index 0000000..3a07ded --- /dev/null +++ b/audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 394224dd9a5da5d794b1079eba2851f5b01a7ff4 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Mon, 7 Mar 2022 11:20:40 -0800 Subject: [PATCH 08/30] DO NOT MERGE Oriole/Raven: enable Dolby DD+ decoder Bug: 198197610 Test: playback of EAC-3 file makes air vibrate Change-Id: I88f2bc9fae6eb8a5e76156bc640045679d1d749a --- device-oriole.mk | 13 +++++++ device-raven.mk | 13 +++++++ media_codecs_bo_dolby_c2.xml | 66 ++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+) create mode 100644 media_codecs_bo_dolby_c2.xml diff --git a/device-oriole.mk b/device-oriole.mk index cee0836..680b054 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -217,3 +217,16 @@ PRODUCT_VENDOR_PROPERTIES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 + +############################################## +# DOLBY integration +include vendor/dolby/ds/dolby-buildspec.mk +$(call inherit-product, vendor/dolby/ds/dolby-product.mk) + +# add list of codecs, but overwrite device/google/gs101/media_codecs_bo_c2.xml +# with same file but with Dolby codecs listed +PRODUCT_COPY_FILES := \ + device/google/raviole/media_codecs_bo_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ + $(PRODUCT_COPY_FILES) + +PRODUCT_RESTRICT_VENDOR_FILES := false diff --git a/device-raven.mk b/device-raven.mk index fba7876..406492c 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -233,3 +233,16 @@ PRODUCT_VENDOR_PROPERTIES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 + +############################################# +# DOLBY integration +include vendor/dolby/ds/dolby-buildspec.mk +$(call inherit-product, vendor/dolby/ds/dolby-product.mk) + +# add list of codecs, but overwrite device/google/gs101/media_codecs_bo_c2.xml +# with same file but with Dolby codecs listed +PRODUCT_COPY_FILES := \ + device/google/raviole/media_codecs_bo_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ + $(PRODUCT_COPY_FILES) + +PRODUCT_RESTRICT_VENDOR_FILES := false diff --git a/media_codecs_bo_dolby_c2.xml b/media_codecs_bo_dolby_c2.xml new file mode 100644 index 0000000..3197674 --- /dev/null +++ b/media_codecs_bo_dolby_c2.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e5caa0867ae5d1ab50ed205c0f47e39dbc2efbe8 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 2 Mar 2022 18:44:45 +0800 Subject: [PATCH 09/30] Enable user_vote_bypass for UDFPS and face unlock Bug: 221173040 Test: Do FP unlock and confirm the user_vote can be bypassed Change-Id: Ic8a727659c88a6a2abac2cc01865a07b23d16d29 --- powerhint-oriole.json | 129 ++++++++++++++++++++++++++++++++++++++++++ powerhint-raven.json | 129 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 258 insertions(+) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 6a8af9a..d820bc0 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -386,6 +386,33 @@ ], "DefaultIndex": 0, "ResetOnInit": false + }, + { + "Name": "CPU_LITTLE_TSKIN_BYPASS", + "Path": "/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote_bypass", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 + }, + { + "Name": "CPU_MID_TSKIN_BYPASS", + "Path": "/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote_bypass", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 + }, + { + "Name": "CPU_BIG_TSKIN_BYPASS", + "Path": "/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote_bypass", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 } ], "Actions": [ @@ -1300,6 +1327,24 @@ "Duration": 1000, "Value": "9999999" }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, { "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMaxFreq", @@ -1312,6 +1357,90 @@ "Duration": 1000, "Value": "9999999" }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, { "PowerHint": "ML_ACC", "Node": "MLUclampBoost", diff --git a/powerhint-raven.json b/powerhint-raven.json index 7487d32..82f3df4 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -387,6 +387,33 @@ ], "DefaultIndex": 0, "ResetOnInit": false + }, + { + "Name": "CPU_LITTLE_TSKIN_BYPASS", + "Path": "/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote_bypass", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 + }, + { + "Name": "CPU_MID_TSKIN_BYPASS", + "Path": "/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote_bypass", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 + }, + { + "Name": "CPU_BIG_TSKIN_BYPASS", + "Path": "/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote_bypass", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 } ], "Actions": [ @@ -1317,18 +1344,120 @@ "Duration": 1000, "Value": "9999999" }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, { "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMaxFreq", "Duration": 1000, "Value": "9999999" }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, { "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMinFreq", "Duration": 1000, "Value": "9999999" }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, { "PowerHint": "ML_ACC", "Node": "MLUclampBoost", From 412664dc84c406d815839ae34c8bc4b00fe4d548 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Mon, 7 Mar 2022 11:20:40 -0800 Subject: [PATCH 10/30] DO NOT MERGE Oriole/Raven: enable Dolby DD+ decoder Bug: 198197610 Test: playback of EAC-3 file makes air vibrate Change-Id: I88f2bc9fae6eb8a5e76156bc640045679d1d749a --- device-oriole.mk | 13 +++++++ device-raven.mk | 13 +++++++ media_codecs_bo_dolby_c2.xml | 66 ++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+) create mode 100644 media_codecs_bo_dolby_c2.xml diff --git a/device-oriole.mk b/device-oriole.mk index cee0836..680b054 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -217,3 +217,16 @@ PRODUCT_VENDOR_PROPERTIES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 + +############################################## +# DOLBY integration +include vendor/dolby/ds/dolby-buildspec.mk +$(call inherit-product, vendor/dolby/ds/dolby-product.mk) + +# add list of codecs, but overwrite device/google/gs101/media_codecs_bo_c2.xml +# with same file but with Dolby codecs listed +PRODUCT_COPY_FILES := \ + device/google/raviole/media_codecs_bo_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ + $(PRODUCT_COPY_FILES) + +PRODUCT_RESTRICT_VENDOR_FILES := false diff --git a/device-raven.mk b/device-raven.mk index fba7876..406492c 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -233,3 +233,16 @@ PRODUCT_VENDOR_PROPERTIES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 + +############################################# +# DOLBY integration +include vendor/dolby/ds/dolby-buildspec.mk +$(call inherit-product, vendor/dolby/ds/dolby-product.mk) + +# add list of codecs, but overwrite device/google/gs101/media_codecs_bo_c2.xml +# with same file but with Dolby codecs listed +PRODUCT_COPY_FILES := \ + device/google/raviole/media_codecs_bo_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ + $(PRODUCT_COPY_FILES) + +PRODUCT_RESTRICT_VENDOR_FILES := false diff --git a/media_codecs_bo_dolby_c2.xml b/media_codecs_bo_dolby_c2.xml new file mode 100644 index 0000000..3197674 --- /dev/null +++ b/media_codecs_bo_dolby_c2.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From abbff533140b6b2c9ada7180f92278f655a24f78 Mon Sep 17 00:00:00 2001 From: Alex Salo Date: Fri, 4 Mar 2022 23:49:37 +0000 Subject: [PATCH 11/30] Update UWB calibration values Difference = 40 * 4.7mm = 18.8 cm Bug: 219968632 Change-Id: Ie30ac01017d98052e55271eda272e75048a3bc3c --- uwb/UWB-calibration.conf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index c5041bf..614093a 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -22,11 +22,11 @@ ant0.ch5.prf64.ant_delay=16450 ant0.ch5.prf64.tx_power=0x4E4E4E4E ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x26 -ant0.ch9.prf16.ant_delay=16450 +ant0.ch9.prf16.ant_delay=16410 ant0.ch9.prf16.tx_power=0x56565656 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x26 -ant0.ch9.prf64.ant_delay=16450 +ant0.ch9.prf64.ant_delay=16410 ant0.ch9.prf64.tx_power=0x56565656 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x26 @@ -41,11 +41,11 @@ ant1.ch5.prf64.ant_delay=16450 ant1.ch5.prf64.tx_power=0x4E4E4E4E ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0x26 -ant1.ch9.prf16.ant_delay=16450 +ant1.ch9.prf16.ant_delay=16410 ant1.ch9.prf16.tx_power=0x56565656 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0x26 -ant1.ch9.prf64.ant_delay=16450 +ant1.ch9.prf64.ant_delay=16410 ant1.ch9.prf64.tx_power=0x56565656 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0x26 @@ -60,11 +60,11 @@ ant2.ch5.prf64.ant_delay=16450 ant2.ch5.prf64.tx_power=0x4E4E4E4E ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0x26 -ant2.ch9.prf16.ant_delay=16450 +ant2.ch9.prf16.ant_delay=16410 ant2.ch9.prf16.tx_power=0x56565656 ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0x26 -ant2.ch9.prf64.ant_delay=16450 +ant2.ch9.prf64.ant_delay=16410 ant2.ch9.prf64.tx_power=0x56565656 ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0x26 @@ -79,11 +79,11 @@ ant3.ch5.prf64.ant_delay=16450 ant3.ch5.prf64.tx_power=0x4E4E4E4E ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0x26 -ant3.ch9.prf16.ant_delay=16450 +ant3.ch9.prf16.ant_delay=16410 ant3.ch9.prf16.tx_power=0x56565656 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0x26 -ant3.ch9.prf64.ant_delay=16450 +ant3.ch9.prf64.ant_delay=16410 ant3.ch9.prf64.tx_power=0x56565656 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0x26 From 3f0fcbce02c260857e02c6633f68ffba26d1a003 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 8 Mar 2022 06:12:39 +0000 Subject: [PATCH 12/30] Update raven SVN to 25 Bug: 223313197 Change-Id: If21b8cd2be84e877f7e0a946b63e58df057f17b2 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 406492c..c6c2c9d 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -187,7 +187,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=24 + ro.vendor.build.svn=25 # Hide cutout overlays PRODUCT_PACKAGES += \ From 6414ff31c8a37eb4e6c55db26ac72588b5abc216 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 8 Mar 2022 06:12:14 +0000 Subject: [PATCH 13/30] Update oriole SVN to 25 Bug: 223313197 Change-Id: Iff092322df7a366281dcf89d8c9987064b6347f8 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 680b054..6eda039 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -175,7 +175,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=24 + ro.vendor.build.svn=25 # Hide cutout overlays PRODUCT_PACKAGES += \ From e7fc69f5204c22752e1f340dafb3239a691102d1 Mon Sep 17 00:00:00 2001 From: Lais Andrade Date: Thu, 10 Mar 2022 18:30:36 +0000 Subject: [PATCH 14/30] Revert "Update notification PWLE patterns to a higher frequency range" This reverts commit 25c80c8cca56c06932e4ef3d93be94aab7479a93. Reason for revert: This frequency range is still unstable, needs to be validated before it can be used. Bug: 223739586 Change-Id: Id3853b1041d441f80b19965f5875040f2aabb8ab --- .../base/core/res/res/values/config.xml | 48 +++++++++---------- .../base/core/res/res/values/config.xml | 48 +++++++++---------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index ed02d61..0b63462 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -236,35 +236,35 @@ --> 0.0 - 160.0 + 60.0 0.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 0.0 - 160.0 + 60.0 100.0 0.0 - 160.0 + 60.0 100.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 0.0 - 160.0 + 60.0 100.0 @@ -277,35 +277,35 @@ --> 0.0 - 160.0 + 60.0 0.0 - 0.24 - 200.0 + 0.4 + 120.0 50.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 0.0 - 160.0 + 60.0 50.0 0.0 - 160.0 + 60.0 100.0 - 0.24 - 200.0 + 0.4 + 120.0 50.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 0.0 - 160.0 + 60.0 50.0 diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 966332c..36b7fdf 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -204,35 +204,35 @@ --> 0.0 - 160.0 + 60.0 0.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 0.0 - 160.0 + 60.0 100.0 0.0 - 160.0 + 60.0 100.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 0.0 - 160.0 + 60.0 100.0 @@ -245,35 +245,35 @@ --> 0.0 - 160.0 + 60.0 0.0 - 0.24 - 200.0 + 0.4 + 120.0 50.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 0.0 - 160.0 + 60.0 50.0 0.0 - 160.0 + 60.0 100.0 - 0.24 - 200.0 + 0.4 + 120.0 50.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 0.0 - 160.0 + 60.0 50.0 From b5b42579261775524a43bb8f50aa54005344fe16 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 10 Mar 2022 10:44:27 +0000 Subject: [PATCH 15/30] Bundle handheld_core_hardware.xml Bug: 223543820 Test: Manual, verify build artifacts Change-Id: I60f9c69690de67f83aca795018fd4d1a824446e7 --- device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ device-slider.mk | 4 ++++ device-whitefin.mk | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 2e3b023..3ee0368 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -238,3 +238,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio_offload.disabled=true \ persist.bluetooth.le_audio_test=true endif + +# Device features +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/device-raven.mk b/device-raven.mk index 96ddd12..91e3942 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -255,3 +255,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio_offload.disabled=true \ persist.bluetooth.le_audio_test=true endif + +# Device features +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/device-slider.mk b/device-slider.mk index 26f8798..647ee73 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -116,3 +116,7 @@ PRODUCT_COPY_FILES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 + +# Device features +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/device-whitefin.mk b/device-whitefin.mk index 69f129d..577092e 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -97,3 +97,7 @@ PRODUCT_COPY_FILES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 + +# Device features +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml From e0d3b2b51a17c047a890c68925a333807f8d0bda Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Thu, 10 Mar 2022 16:13:32 -0800 Subject: [PATCH 16/30] DO NOT MERGE Fix build: no vendor specific files in without-vendor Remove vendor-specific codec config and .mk includes in without-vendor branch Change-Id: Iffbd2ee10ed3485c8060f0b3e36e6730fe48fd2b --- device-oriole.mk | 13 ------- device-raven.mk | 13 ------- media_codecs_bo_dolby_c2.xml | 66 ------------------------------------ 3 files changed, 92 deletions(-) delete mode 100644 media_codecs_bo_dolby_c2.xml diff --git a/device-oriole.mk b/device-oriole.mk index e8fb434..e22e0b3 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -217,16 +217,3 @@ PRODUCT_VENDOR_PROPERTIES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 - -############################################## -# DOLBY integration -include vendor/dolby/ds/dolby-buildspec.mk -$(call inherit-product, vendor/dolby/ds/dolby-product.mk) - -# add list of codecs, but overwrite device/google/gs101/media_codecs_bo_c2.xml -# with same file but with Dolby codecs listed -PRODUCT_COPY_FILES := \ - device/google/raviole/media_codecs_bo_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ - $(PRODUCT_COPY_FILES) - -PRODUCT_RESTRICT_VENDOR_FILES := false diff --git a/device-raven.mk b/device-raven.mk index 27d2fc6..4f16dc5 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -233,16 +233,3 @@ PRODUCT_VENDOR_PROPERTIES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 - -############################################# -# DOLBY integration -include vendor/dolby/ds/dolby-buildspec.mk -$(call inherit-product, vendor/dolby/ds/dolby-product.mk) - -# add list of codecs, but overwrite device/google/gs101/media_codecs_bo_c2.xml -# with same file but with Dolby codecs listed -PRODUCT_COPY_FILES := \ - device/google/raviole/media_codecs_bo_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ - $(PRODUCT_COPY_FILES) - -PRODUCT_RESTRICT_VENDOR_FILES := false diff --git a/media_codecs_bo_dolby_c2.xml b/media_codecs_bo_dolby_c2.xml deleted file mode 100644 index 3197674..0000000 --- a/media_codecs_bo_dolby_c2.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From d228473ab412300bf8c93baa2e80bbff6df6e127 Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Mon, 14 Feb 2022 11:01:46 -0800 Subject: [PATCH 17/30] raviole(uwb): update calibration file for uci uwb stack Bug: 186585880 Test: Manual Tests Change-Id: I495a214b6d9141fe0cf7b69fcb6721314721b9cd --- uwb/UWB-calibration.conf | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index 614093a..dbda3f4 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -1,6 +1,4 @@ -[CCC]format=1 -[CCC]kind=0 -[CCC]settings=1 +[CCC]version=2 [CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 [CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 [CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 @@ -110,8 +108,26 @@ xtal_trim=31 temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 -[HAL]antenna_pair_azimuth=4 -[HAL]antenna_pair_elevation=0xff -[HAL]tx_antenna=0 -[HAL]minimum_system_offset_uwbtime0=300 restricted_channels=0 +[HAL]aoa_capability=1 +[HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0 +[HAL]minimum_system_offset_uwbtime0=300 +coex_gpio=4 +coex_delay_us=1000 +coex_margin_us=500 +coex_interval_us=2000 From 8e1b6a6f1c87bbdae8b2b9c7c00873875279e1fe Mon Sep 17 00:00:00 2001 From: Gary Jian Date: Tue, 8 Mar 2022 12:46:11 +0800 Subject: [PATCH 18/30] Handle the network selection restoring in modem side Bug: 222483102 Test: manual Change-Id: Iad7af99ce56714001e0a35bd092b491af52ffdf2 --- oriole/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ raven/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index 0b63462..9b9c255 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -380,4 +380,7 @@ 200 + + + true diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 36b7fdf..6989086 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -356,4 +356,7 @@ 200 + + + true From 97db8559e16b3cb8ace2978042b1324948d9b062 Mon Sep 17 00:00:00 2001 From: Ken Tsou Date: Wed, 16 Mar 2022 17:50:30 +0800 Subject: [PATCH 19/30] battery: Correct the filename to init.wlc.rc Bug: 191762054 Change-Id: Ie734eb39b58e2c2c4d56f83c95374a8969212e04 Signed-off-by: Ken Tsou --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 3ee0368..22dc70b 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -174,7 +174,7 @@ PRODUCT_PROPERTY_OVERRIDES += ro.odm.build.media_performance_class=31 # userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ - device/google/gs101/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_PLATFORM).wlc.rc + device/google/gs101/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc endif # Increment the SVN for any official public releases diff --git a/device-raven.mk b/device-raven.mk index 91e3942..001d6bf 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -187,7 +187,7 @@ PRODUCT_SOONG_NAMESPACES += \ # userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ - device/google/gs101/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_PLATFORM).wlc.rc + device/google/gs101/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc endif # Increment the SVN for any official public releases From 432fc04f642ae18c899db4613468ca5932ddf6bc Mon Sep 17 00:00:00 2001 From: justinweng Date: Tue, 25 Jan 2022 15:45:21 +0800 Subject: [PATCH 20/30] audio: add immersive output Bug: 189423448 Test: build passed. Signed-off-by: justinweng Change-Id: I0a14bd264fb79f56698ab626bd71af7f72e9fff8 --- .../config/audio_platform_configuration.xml | 1 + .../config/audio_policy_configuration.xml | 20 +++++++++++-------- ...cy_configuration_a2dp_offload_disabled.xml | 10 +++++++--- ...licy_configuration_le_offload_disabled.xml | 16 +++++++++------ audio/oriole/config/mixer_paths.xml | 12 +++++++++++ .../config/audio_platform_configuration.xml | 1 + .../config/audio_policy_configuration.xml | 20 +++++++++++-------- ...cy_configuration_a2dp_offload_disabled.xml | 10 +++++++--- ...licy_configuration_le_offload_disabled.xml | 16 +++++++++------ audio/raven/config/mixer_paths.xml | 12 +++++++++++ 10 files changed, 84 insertions(+), 34 deletions(-) diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml index f0bec9b..bf4ff18 100644 --- a/audio/oriole/config/audio_platform_configuration.xml +++ b/audio/oriole/config/audio_platform_configuration.xml @@ -182,6 +182,7 @@ + diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index ed81992..d792e27 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -63,6 +63,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + + + + + + + + + diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml index f0bec9b..bf4ff18 100644 --- a/audio/raven/config/audio_platform_configuration.xml +++ b/audio/raven/config/audio_platform_configuration.xml @@ -182,6 +182,7 @@ + diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index ed81992..d792e27 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -63,6 +63,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + + + + + + + + + From 434b1bdfb59b7349e67c6b6749539458ef81a0fc Mon Sep 17 00:00:00 2001 From: Patty Date: Tue, 22 Mar 2022 12:09:58 +0800 Subject: [PATCH 21/30] The property persist.bluetooth.le_audio_test should be false by default, only set to true when testing LE Audio Bug: 220837601 Test: build pass Change-Id: I0ab26985933fe42127b754a3199beb5d30afb014 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 22dc70b..575ed1b 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -236,7 +236,7 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio_offload.supported=true \ persist.bluetooth.leaudio_offload.disabled=true \ - persist.bluetooth.le_audio_test=true + persist.bluetooth.le_audio_test=false endif # Device features diff --git a/device-raven.mk b/device-raven.mk index 001d6bf..9522635 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -253,7 +253,7 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio_offload.supported=true \ persist.bluetooth.leaudio_offload.disabled=true \ - persist.bluetooth.le_audio_test=true + persist.bluetooth.le_audio_test=false endif # Device features From 8074cbccb4dd0c0ffe4a6424f65b362014c80ed6 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Mon, 7 Mar 2022 11:20:40 -0800 Subject: [PATCH 22/30] Oriole/Raven: enable Dolby DD+ decoder Bug: 225220771 Bug: 198197610 Test: playback of EAC-3 file makes air vibrate Change-Id: I88f2bc9fae6eb8a5e76156bc640045679d1d749a --- device-oriole.mk | 10 ++++++ device-raven.mk | 10 ++++++ media_codecs_dolby_c2.xml | 66 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 media_codecs_dolby_c2.xml diff --git a/device-oriole.mk b/device-oriole.mk index 575ed1b..7bde14e 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -242,3 +242,13 @@ endif # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml + +# Dolby integration +-include vendor/dolby/ds/dolby-buildspec.mk +$(call inherit-product-if-exists, vendor/dolby/ds/dolby-product.mk) +# overwrite file coming from device/google/gs101/media_codecs_bo_c2.xml +PRODUCT_COPY_FILES := \ + device/google/raviole/media_codecs_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ + $(PRODUCT_COPY_FILES) + +PRODUCT_RESTRICT_VENDOR_FILES := false diff --git a/device-raven.mk b/device-raven.mk index 9522635..91c6ea8 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -259,3 +259,13 @@ endif # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml + +# Dolby integration +-include vendor/dolby/ds/dolby-buildspec.mk +$(call inherit-product-if-exists, vendor/dolby/ds/dolby-product.mk) +# overwrite file coming from device/google/gs101/media_codecs_bo_c2.xml +PRODUCT_COPY_FILES := \ + device/google/raviole/media_codecs_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ + $(PRODUCT_COPY_FILES) + +PRODUCT_RESTRICT_VENDOR_FILES := false diff --git a/media_codecs_dolby_c2.xml b/media_codecs_dolby_c2.xml new file mode 100644 index 0000000..e7ecfd9 --- /dev/null +++ b/media_codecs_dolby_c2.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 0a1b979e6b2779837b7a920becfc833a9aa8aba6 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Thu, 16 Sep 2021 15:58:09 +0200 Subject: [PATCH 23/30] Audio configuration for spatial audio Update audio policy and effect configuration files to support spatial audio feature Bug: 189423448 Test: make Change-Id: I2274fb4784eef5e28cadd9f33c38fdbbe60f6b40 --- audio/oriole/audio-tables.mk | 2 +- audio/oriole/config/audio_effects.xml | 2 + ...with_le_audio_policy_configuration_7_0.xml | 71 +++++++++++++++++++ audio/raven/audio-tables.mk | 2 +- audio/raven/config/audio_effects.xml | 2 + ...with_le_audio_policy_configuration_7_0.xml | 71 +++++++++++++++++++ 6 files changed, 148 insertions(+), 2 deletions(-) create mode 100644 audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml create mode 100644 audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml diff --git a/audio/oriole/audio-tables.mk b/audio/oriole/audio-tables.mk index f9c3759..8d15bf9 100644 --- a/audio/oriole/audio-tables.mk +++ b/audio/oriole/audio-tables.mk @@ -25,7 +25,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - frameworks/av/services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml + device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/oriole/config/audio_effects.xml b/audio/oriole/config/audio_effects.xml index 1718057..e35bfbd 100644 --- a/audio/oriole/config/audio_effects.xml +++ b/audio/oriole/config/audio_effects.xml @@ -10,6 +10,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml new file mode 100644 index 0000000..8b2af59 --- /dev/null +++ b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/audio/raven/audio-tables.mk b/audio/raven/audio-tables.mk index b8538ad..11e20b1 100644 --- a/audio/raven/audio-tables.mk +++ b/audio/raven/audio-tables.mk @@ -25,7 +25,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - frameworks/av/services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml + device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/raven/config/audio_effects.xml b/audio/raven/config/audio_effects.xml index 1718057..e35bfbd 100644 --- a/audio/raven/config/audio_effects.xml +++ b/audio/raven/config/audio_effects.xml @@ -10,6 +10,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml new file mode 100644 index 0000000..e3f27d9 --- /dev/null +++ b/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2cd7779f904657db29707f1f3ffc34223438a127 Mon Sep 17 00:00:00 2001 From: Lais Andrade Date: Mon, 7 Mar 2022 22:49:17 +0000 Subject: [PATCH 24/30] Revert notification patterns to default pre-S ones Fix: 210535717 Test: manual Change-Id: I6ead011f1cc28ea0c061941ab1665ed8250c3784 (cherry picked from commit ba9024c7802357ae2da0b6ae6a9d889544611f03) --- .../base/core/res/res/values/config.xml | 82 ------------------- .../base/core/res/res/values/config.xml | 82 ------------------- 2 files changed, 164 deletions(-) diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index 9b9c255..9ee7aae 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -227,88 +227,6 @@ non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. --> 50 - - - 0.0 - 60.0 - 0.0 - - 0.4 - 120.0 - 100.0 - - 0.4 - 120.0 - 100.0 - - 0.0 - 60.0 - 100.0 - - 0.0 - 60.0 - 100.0 - - 0.4 - 120.0 - 100.0 - - 0.4 - 120.0 - 100.0 - - 0.0 - 60.0 - 100.0 - - - - - 0.0 - 60.0 - 0.0 - - 0.4 - 120.0 - 50.0 - - 0.4 - 120.0 - 100.0 - - 0.0 - 60.0 - 50.0 - - 0.0 - 60.0 - 100.0 - - 0.4 - 120.0 - 50.0 - - 0.4 - 120.0 - 100.0 - - 0.0 - 60.0 - 50.0 - - 64 diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 6989086..b136a5d 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -195,88 +195,6 @@ non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. --> 50 - - - 0.0 - 60.0 - 0.0 - - 0.4 - 120.0 - 100.0 - - 0.4 - 120.0 - 100.0 - - 0.0 - 60.0 - 100.0 - - 0.0 - 60.0 - 100.0 - - 0.4 - 120.0 - 100.0 - - 0.4 - 120.0 - 100.0 - - 0.0 - 60.0 - 100.0 - - - - - 0.0 - 60.0 - 0.0 - - 0.4 - 120.0 - 50.0 - - 0.4 - 120.0 - 100.0 - - 0.0 - 60.0 - 50.0 - - 0.0 - 60.0 - 100.0 - - 0.4 - 120.0 - 50.0 - - 0.4 - 120.0 - 100.0 - - 0.0 - 60.0 - 50.0 - - From c2f3022c06fa6e4fa19db1199a6646a281423159 Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Tue, 22 Mar 2022 09:59:31 -0700 Subject: [PATCH 25/30] uwb: Increase CCC uwbtime0 delay Delay between NFC start and kernel has increased This patchs update this delay to avoid lock at start Bug: 223228405 Signed-off-by: Victor Liu Change-Id: I35aacc9d8e0b03acb9a7b4e83992464cc425ab2a --- uwb/UWB-calibration.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index dbda3f4..694a039 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -126,7 +126,7 @@ restricted_channels=0 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0 -[HAL]minimum_system_offset_uwbtime0=300 +[HAL]minimum_system_offset_uwbtime0=500 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 From 1031eebb39d49809bc77614d3fb73ea25641a6ee Mon Sep 17 00:00:00 2001 From: chungkai Date: Wed, 23 Mar 2022 09:46:41 +0000 Subject: [PATCH 26/30] sched: move sysfs to procfs Modify the path of vendor_sched nodes Test: powerhal work normally Bug: 216207007 Signed-off-by: chungkai Change-Id: I9dda321cd3375fc6dfd40c0050bd229f1d000f97 --- powerhint-oriole.json | 16 ++++++++-------- powerhint-raven.json | 16 ++++++++-------- powerhint-slider.json | 16 ++++++++-------- powerhint-whitefin.json | 16 ++++++++-------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index d820bc0..a555bca 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -121,7 +121,7 @@ }, { "Name": "CPUUtilThreshold", - "Path": "/sys/kernel/vendor_sched/util_threshold", + "Path": "/proc/vendor_sched/util_threshold", "Values": [ "1280", "1100" @@ -140,7 +140,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/sys/kernel/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", "108", @@ -153,7 +153,7 @@ }, { "Name": "SFUClampBoost", - "Path": "/sys/kernel/vendor_sched/sf_uclamp_min", + "Path": "/proc/vendor_sched/sf_uclamp_min", "Values": [ "125", "65", @@ -163,7 +163,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/sys/kernel/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ "154", "512" @@ -173,7 +173,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/sys/kernel/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/cam_prefer_idle", "Values": [ "0", "1" @@ -236,7 +236,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/sys/kernel/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/ta_prefer_high_cap", "Values": [ "1", "0" @@ -245,7 +245,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/sys/kernel/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/ta_prefer_idle", "Values": [ "0", "1" @@ -254,7 +254,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/sys/kernel/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/cam_prefer_high_cap", "Values": [ "1", "0" diff --git a/powerhint-raven.json b/powerhint-raven.json index 82f3df4..b776df9 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -121,7 +121,7 @@ }, { "Name": "CPUUtilThreshold", - "Path": "/sys/kernel/vendor_sched/util_threshold", + "Path": "/proc/vendor_sched/util_threshold", "Values": [ "1280", "1100" @@ -140,7 +140,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/sys/kernel/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", "158", @@ -154,7 +154,7 @@ }, { "Name": "SFUClampBoost", - "Path": "/sys/kernel/vendor_sched/sf_uclamp_min", + "Path": "/proc/vendor_sched/sf_uclamp_min", "Values": [ "125", "65", @@ -164,7 +164,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/sys/kernel/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ "154", "512" @@ -174,7 +174,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/sys/kernel/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/cam_prefer_idle", "Values": [ "0", "1" @@ -237,7 +237,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/sys/kernel/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/ta_prefer_high_cap", "Values": [ "1", "0" @@ -246,7 +246,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/sys/kernel/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/ta_prefer_idle", "Values": [ "0", "1" @@ -255,7 +255,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/sys/kernel/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/cam_prefer_high_cap", "Values": [ "1", "0" diff --git a/powerhint-slider.json b/powerhint-slider.json index b342d53..d5eab6b 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -121,7 +121,7 @@ }, { "Name": "CPUUtilThreshold", - "Path": "/sys/kernel/vendor_sched/util_threshold", + "Path": "/proc/vendor_sched/util_threshold", "Values": [ "1280", "1100" @@ -140,7 +140,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/sys/kernel/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", "158", @@ -155,7 +155,7 @@ }, { "Name": "SFUClampBoost", - "Path": "/sys/kernel/vendor_sched/sf_uclamp_min", + "Path": "/proc/vendor_sched/sf_uclamp_min", "Values": [ "125", "65", @@ -165,7 +165,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/sys/kernel/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ "154", "512" @@ -175,7 +175,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/sys/kernel/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/cam_prefer_idle", "Values": [ "0", "1" @@ -229,7 +229,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/sys/kernel/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/ta_prefer_high_cap", "Values": [ "1", "0" @@ -238,7 +238,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/sys/kernel/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/ta_prefer_idle", "Values": [ "0", "1" @@ -247,7 +247,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/sys/kernel/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/cam_prefer_high_cap", "Values": [ "1", "0" diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index b342d53..d5eab6b 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -121,7 +121,7 @@ }, { "Name": "CPUUtilThreshold", - "Path": "/sys/kernel/vendor_sched/util_threshold", + "Path": "/proc/vendor_sched/util_threshold", "Values": [ "1280", "1100" @@ -140,7 +140,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/sys/kernel/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", "158", @@ -155,7 +155,7 @@ }, { "Name": "SFUClampBoost", - "Path": "/sys/kernel/vendor_sched/sf_uclamp_min", + "Path": "/proc/vendor_sched/sf_uclamp_min", "Values": [ "125", "65", @@ -165,7 +165,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/sys/kernel/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ "154", "512" @@ -175,7 +175,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/sys/kernel/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/cam_prefer_idle", "Values": [ "0", "1" @@ -229,7 +229,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/sys/kernel/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/ta_prefer_high_cap", "Values": [ "1", "0" @@ -238,7 +238,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/sys/kernel/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/ta_prefer_idle", "Values": [ "0", "1" @@ -247,7 +247,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/sys/kernel/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/cam_prefer_high_cap", "Values": [ "1", "0" From 582883831c6bb8cdd2a40aab92494ebd37a0aed9 Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Fri, 1 Apr 2022 09:27:20 -0700 Subject: [PATCH 27/30] uwb: update aoa_capability in calibration file Test: builds Bug: 227427724 Signed-off-by: Victor Liu Change-Id: I85a352342386b8e666ff5d2b71c7b328cd382b8f --- uwb/UWB-calibration.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index 694a039..c5c267b 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -122,6 +122,14 @@ restricted_channels=0 [HAL]ant_sets.ch9.range.rx_ant_set_ranging = 4 [HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 0 [HAL]ant_sets.ch9.range.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch5.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging = 0 [HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0 From c0d282f6b7903470166cbb501aefec85177ecb1f Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Tue, 29 Mar 2022 14:35:37 -0700 Subject: [PATCH 28/30] Raviole: disable DD+ decoder Bug: 225544444 Bug: 228207876 Test: adb shell ps | grep vendor.dolby.media.c2\@ is empty after boot Change-Id: I030739e6d9772671b160e21afe62579a1bf3b987 --- device-oriole.mk | 13 ------- device-raven.mk | 13 ------- media_codecs_bo_dolby_c2.xml | 66 ------------------------------------ 3 files changed, 92 deletions(-) delete mode 100644 media_codecs_bo_dolby_c2.xml diff --git a/device-oriole.mk b/device-oriole.mk index 6eda039..ff4015b 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -217,16 +217,3 @@ PRODUCT_VENDOR_PROPERTIES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 - -############################################## -# DOLBY integration -include vendor/dolby/ds/dolby-buildspec.mk -$(call inherit-product, vendor/dolby/ds/dolby-product.mk) - -# add list of codecs, but overwrite device/google/gs101/media_codecs_bo_c2.xml -# with same file but with Dolby codecs listed -PRODUCT_COPY_FILES := \ - device/google/raviole/media_codecs_bo_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ - $(PRODUCT_COPY_FILES) - -PRODUCT_RESTRICT_VENDOR_FILES := false diff --git a/device-raven.mk b/device-raven.mk index c6c2c9d..7f9c6fb 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -233,16 +233,3 @@ PRODUCT_VENDOR_PROPERTIES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 - -############################################# -# DOLBY integration -include vendor/dolby/ds/dolby-buildspec.mk -$(call inherit-product, vendor/dolby/ds/dolby-product.mk) - -# add list of codecs, but overwrite device/google/gs101/media_codecs_bo_c2.xml -# with same file but with Dolby codecs listed -PRODUCT_COPY_FILES := \ - device/google/raviole/media_codecs_bo_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ - $(PRODUCT_COPY_FILES) - -PRODUCT_RESTRICT_VENDOR_FILES := false diff --git a/media_codecs_bo_dolby_c2.xml b/media_codecs_bo_dolby_c2.xml deleted file mode 100644 index 3197674..0000000 --- a/media_codecs_bo_dolby_c2.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From b5ddd964d3fa3fc5460efce54e616c56fc53028b Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Fri, 1 Apr 2022 18:47:27 +0800 Subject: [PATCH 29/30] thermal: Hide the sensors which are not used by framework Bug: 227686549 Test: adb shell dumpsys thermalservice Change-Id: Ib443248437ca38580a3d6eba88bdc831f9515e6a --- thermal_info_config_oriole.json | 28 ++++++++++++++++++---------- thermal_info_config_raven.json | 29 ++++++++++++++++++----------- 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index 0594f53..6da4f20 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -182,6 +182,7 @@ { "Name":"VIRTUAL-QI-GNSS", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -208,6 +209,7 @@ { "Name":"VIRTUAL-QI-QUIET", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -233,6 +235,7 @@ { "Name":"VIRTUAL-QI-BATT", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -259,6 +262,7 @@ { "Name":"VIRTUAL-USB2-DISP", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -285,6 +289,7 @@ { "Name":"VIRTUAL-QUIET-BATT", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -407,6 +412,7 @@ { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", @@ -442,7 +448,6 @@ ], "VrThreshold":"NAN", "Multiplier":0.001, - "Monitor":true, "PollingDelay":300000, "PassiveDelay":7000, "BindedCdevInfo": [ @@ -520,6 +525,7 @@ { "Name":"USB2-MINUS-USB", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -545,6 +551,7 @@ { "Name":"USB2-MINUS-QI", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -570,6 +577,7 @@ { "Name":"VIRTUAL-USB-THROTTLING", "Type":"USB_PORT", + "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm2", @@ -783,7 +791,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"batoilo", @@ -964,7 +972,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"ocp_cpu2", @@ -989,7 +997,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"ocp_tpu", @@ -1014,7 +1022,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"ocp_gpu", @@ -1039,7 +1047,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_cpu2", @@ -1064,7 +1072,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_cpu1", @@ -1089,7 +1097,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_tpu", @@ -1114,7 +1122,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_gpu", @@ -1139,7 +1147,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"TPU", diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index bc4ebd9..7448099 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -182,6 +182,7 @@ { "Name":"VIRTUAL-NEUTRAL-QI", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -208,6 +209,7 @@ { "Name":"VIRTUAL-USB2-BATT", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -234,6 +236,7 @@ { "Name":"VIRTUAL-GNSS-BATT", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -260,6 +263,7 @@ { "Name":"VIRTUAL-QI-DISP", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -382,6 +386,7 @@ { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", @@ -417,7 +422,6 @@ ], "VrThreshold":"NAN", "Multiplier":0.001, - "Monitor":true, "PollingDelay":300000, "PassiveDelay":7000, "BindedCdevInfo": [ @@ -495,6 +499,7 @@ { "Name":"USB2-MINUS-USB", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -520,6 +525,7 @@ { "Name":"USB2-MINUS-QI", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -545,6 +551,7 @@ { "Name":"VIRTUAL-USB-THROTTLING", "Type":"USB_PORT", + "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm2", @@ -758,7 +765,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"batoilo", @@ -938,8 +945,8 @@ 0.0 ], "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true + "Multiplier":1 + "Hidden":true, }, { "Name":"ocp_cpu2", @@ -964,7 +971,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"ocp_tpu", @@ -989,7 +996,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"ocp_gpu", @@ -1014,7 +1021,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_cpu2", @@ -1039,7 +1046,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_cpu1", @@ -1064,7 +1071,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_tpu", @@ -1089,7 +1096,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_gpu", @@ -1114,7 +1121,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"TPU", From 4396e70e6e456e1d6cad414998b32617027c831b Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 6 Apr 2022 12:27:12 +0800 Subject: [PATCH 30/30] thermal: fix the invalid settings Bug: 228257654 Test: boot to home Change-Id: I611695b9dab6aea93061b5229d6665f0731879f7 --- thermal_info_config_raven.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index 7448099..0006b70 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -921,7 +921,7 @@ "CdevRequest": "tpu_cooling", "LimitInfo": [0, 0, 0, 0, 4, 4, 4] } - ] + ] }, { "Name":"ocp_cpu1", @@ -945,8 +945,8 @@ 0.0 ], "VrThreshold":"NAN", - "Multiplier":1 - "Hidden":true, + "Multiplier":1, + "Hidden":true }, { "Name":"ocp_cpu2",