From a6dca6e3ab19567565acfec2f9ad123384b34311 Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Mon, 8 Mar 2021 18:48:57 -0800 Subject: [PATCH 1/5] raven: load the faceauth.app on boot Bug: 182207615 Test: log trusty_apploader Change-Id: I4de8dedcaba966ade080216237dcca8231da613b --- conf/init.raven.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/init.raven.rc b/conf/init.raven.rc index 30cfbf5..3c2e4f9 100644 --- a/conf/init.raven.rc +++ b/conf/init.raven.rc @@ -28,6 +28,9 @@ on fs chown system system /dev/goodix_fp exec_background /vendor/bin/trusty_apploader /vendor/firmware/g6.app + # Face + exec_background /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app + on property:mfgapi.touchpanel.permission=1 chmod 0600 /sys/devices/virtual/sec/tsp/cmd chown system system /sys/devices/virtual/sec/tsp/cmd From 0a7ce9cef82d304ea525f685eb5a4a73d5995e98 Mon Sep 17 00:00:00 2001 From: David Li Date: Thu, 11 Mar 2021 16:10:04 +0800 Subject: [PATCH 2/5] audio: add incall playback and capture to policy config and mixer path Bug: 165750425 Test: make -j128, test call screen feature on oriole Change-Id: I9d002359d119bc65932442d27aa5a13cc9193be0 --- .../config/audio_policy_configuration.xml | 34 ++++++++++++++++++- ...cy_configuration_a2dp_offload_disabled.xml | 34 ++++++++++++++++++- ...icy_configuration_bluetooth_legacy_hal.xml | 34 ++++++++++++++++++- audio/oriole/config/mixer_paths.xml | 32 +++++++++++++++++ .../config/audio_policy_configuration.xml | 34 ++++++++++++++++++- ...cy_configuration_a2dp_offload_disabled.xml | 34 ++++++++++++++++++- ...icy_configuration_bluetooth_legacy_hal.xml | 34 ++++++++++++++++++- audio/raven/config/mixer_paths.xml | 32 +++++++++++++++++ .../config/audio_policy_configuration.xml | 34 ++++++++++++++++++- ...cy_configuration_a2dp_offload_disabled.xml | 34 ++++++++++++++++++- ...icy_configuration_bluetooth_legacy_hal.xml | 34 ++++++++++++++++++- audio/slider/config/mixer_paths.xml | 33 ++++++++++++++++++ .../config/audio_policy_configuration.xml | 4 +-- ...cy_configuration_a2dp_offload_disabled.xml | 34 ++++++++++++++++++- ...icy_configuration_bluetooth_legacy_hal.xml | 34 ++++++++++++++++++- 15 files changed, 462 insertions(+), 13 deletions(-) diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index 1e71bf3..b7ee8a8 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -11,7 +11,7 @@ limitations under the License. --> - + @@ -20,6 +20,8 @@ Speaker Safe Earpiece Built-In Mic + Telephony Tx + Voice Call And Telephony Rx Speaker @@ -55,6 +57,17 @@ + + + + + + + + + + + + @@ -90,6 +113,9 @@ + + + @@ -117,6 +143,9 @@ + + + @@ -130,6 +159,8 @@ sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + + + diff --git a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml index 688fc50..19794e1 100644 --- a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -11,7 +11,7 @@ limitations under the License. --> - + @@ -20,6 +20,8 @@ Speaker Safe Earpiece Built-In Mic + Telephony Tx + Voice Call And Telephony Rx Speaker @@ -55,6 +57,17 @@ + + + + + + + + + + + + @@ -90,6 +113,9 @@ + + + @@ -102,6 +128,9 @@ + + + @@ -115,6 +144,8 @@ sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + + + diff --git a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml index cd4945b..0c36d06 100644 --- a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -11,7 +11,7 @@ limitations under the License. --> - + @@ -20,6 +20,8 @@ Speaker Safe Earpiece Built-In Mic + Telephony Tx + Voice Call And Telephony Rx Speaker @@ -55,6 +57,17 @@ + + + + + + + + + + + + @@ -90,6 +113,9 @@ + + + @@ -102,6 +128,9 @@ + + + @@ -115,6 +144,8 @@ sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + + + diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml index 11fe950..e0bc8fc 100644 --- a/audio/oriole/config/mixer_paths.xml +++ b/audio/oriole/config/mixer_paths.xml @@ -232,6 +232,10 @@ + + + + @@ -558,6 +562,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + > diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index 1e71bf3..b7ee8a8 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -11,7 +11,7 @@ limitations under the License. --> - + @@ -20,6 +20,8 @@ Speaker Safe Earpiece Built-In Mic + Telephony Tx + Voice Call And Telephony Rx Speaker @@ -55,6 +57,17 @@ + + + + + + + + + + + + @@ -90,6 +113,9 @@ + + + @@ -117,6 +143,9 @@ + + + @@ -130,6 +159,8 @@ sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + + + diff --git a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml index 688fc50..19794e1 100644 --- a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -11,7 +11,7 @@ limitations under the License. --> - + @@ -20,6 +20,8 @@ Speaker Safe Earpiece Built-In Mic + Telephony Tx + Voice Call And Telephony Rx Speaker @@ -55,6 +57,17 @@ + + + + + + + + + + + + @@ -90,6 +113,9 @@ + + + @@ -102,6 +128,9 @@ + + + @@ -115,6 +144,8 @@ sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + + + diff --git a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml index cd4945b..0c36d06 100644 --- a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -11,7 +11,7 @@ limitations under the License. --> - + @@ -20,6 +20,8 @@ Speaker Safe Earpiece Built-In Mic + Telephony Tx + Voice Call And Telephony Rx Speaker @@ -55,6 +57,17 @@ + + + + + + + + + + + + @@ -90,6 +113,9 @@ + + + @@ -102,6 +128,9 @@ + + + @@ -115,6 +144,8 @@ sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + + + diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml index 11fe950..e0bc8fc 100644 --- a/audio/raven/config/mixer_paths.xml +++ b/audio/raven/config/mixer_paths.xml @@ -232,6 +232,10 @@ + + + + @@ -558,6 +562,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + > diff --git a/audio/slider/config/audio_policy_configuration.xml b/audio/slider/config/audio_policy_configuration.xml index 1e71bf3..b7ee8a8 100644 --- a/audio/slider/config/audio_policy_configuration.xml +++ b/audio/slider/config/audio_policy_configuration.xml @@ -11,7 +11,7 @@ limitations under the License. --> - + @@ -20,6 +20,8 @@ Speaker Safe Earpiece Built-In Mic + Telephony Tx + Voice Call And Telephony Rx Speaker @@ -55,6 +57,17 @@ + + + + + + + + + + + + @@ -90,6 +113,9 @@ + + + @@ -117,6 +143,9 @@ + + + @@ -130,6 +159,8 @@ sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + + + diff --git a/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml index 688fc50..19794e1 100644 --- a/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -11,7 +11,7 @@ limitations under the License. --> - + @@ -20,6 +20,8 @@ Speaker Safe Earpiece Built-In Mic + Telephony Tx + Voice Call And Telephony Rx Speaker @@ -55,6 +57,17 @@ + + + + + + + + + + + + @@ -90,6 +113,9 @@ + + + @@ -102,6 +128,9 @@ + + + @@ -115,6 +144,8 @@ sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + + + diff --git a/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml index cd4945b..0c36d06 100644 --- a/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -11,7 +11,7 @@ limitations under the License. --> - + @@ -20,6 +20,8 @@ Speaker Safe Earpiece Built-In Mic + Telephony Tx + Voice Call And Telephony Rx Speaker @@ -55,6 +57,17 @@ + + + + + + + + + + + + @@ -90,6 +113,9 @@ + + + @@ -102,6 +128,9 @@ + + + @@ -115,6 +144,8 @@ sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + + + diff --git a/audio/slider/config/mixer_paths.xml b/audio/slider/config/mixer_paths.xml index d758204..ed7c2fe 100644 --- a/audio/slider/config/mixer_paths.xml +++ b/audio/slider/config/mixer_paths.xml @@ -196,6 +196,10 @@ + + + + @@ -521,6 +525,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > diff --git a/audio/whitefin/config/audio_policy_configuration.xml b/audio/whitefin/config/audio_policy_configuration.xml index 6da94d2..31f5c57 100644 --- a/audio/whitefin/config/audio_policy_configuration.xml +++ b/audio/whitefin/config/audio_policy_configuration.xml @@ -56,12 +56,12 @@ flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC"> + channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> + channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - + @@ -20,6 +20,8 @@ Speaker Safe Earpiece Built-In Mic + Telephony Tx + Voice Call And Telephony Rx Speaker @@ -50,6 +52,17 @@ + + + + + + + + + + + + @@ -85,6 +108,9 @@ + + + @@ -97,6 +123,9 @@ + + + @@ -110,6 +139,8 @@ sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + + + diff --git a/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 7614235..d4955f4 100644 --- a/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -11,7 +11,7 @@ limitations under the License. --> - + @@ -20,6 +20,8 @@ Speaker Safe Earpiece Built-In Mic + Telephony Tx + Voice Call And Telephony Rx Speaker @@ -50,6 +52,17 @@ + + + + + + + + + + + + @@ -85,6 +108,9 @@ + + + @@ -97,6 +123,9 @@ + + + @@ -110,6 +139,8 @@ sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + + + From e37fc7d8d527b8bd817239402b0c06a0ca718bf2 Mon Sep 17 00:00:00 2001 From: George Lee Date: Thu, 11 Mar 2021 12:39:19 -0800 Subject: [PATCH 3/5] thermal: remove vdroop1/2 for canopy compatibility Bug: 182476064 Test: Local Test Signed-off-by: George Lee Change-Id: Ib964e7b25650b55cfe39e8887ba38f4a70684049 --- thermal_info_config_slider.json | 38 +++---------------------------- thermal_info_config_whitefin.json | 38 +++---------------------------- 2 files changed, 6 insertions(+), 70 deletions(-) diff --git a/thermal_info_config_slider.json b/thermal_info_config_slider.json index 02201e6..b4c90a0 100644 --- a/thermal_info_config_slider.json +++ b/thermal_info_config_slider.json @@ -107,16 +107,16 @@ "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", + "TriggerSensor": "smpl_gm", "Combination":[ "battery", "battery_cycle", - "vdroop1" + "smpl_gm" ], "Coefficient":[ "-10000", "400", - "1200" + "1400" ], "HotThreshold":[ "NAN", @@ -148,38 +148,6 @@ "Multiplier":1, "Monitor":false }, - { - "Name":"vdroop1", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1200, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"vdroop2", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1200, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, { "Name":"smpl_gm", "Type":"BCL_VOLTAGE", diff --git a/thermal_info_config_whitefin.json b/thermal_info_config_whitefin.json index 02201e6..b4c90a0 100644 --- a/thermal_info_config_whitefin.json +++ b/thermal_info_config_whitefin.json @@ -107,16 +107,16 @@ "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", + "TriggerSensor": "smpl_gm", "Combination":[ "battery", "battery_cycle", - "vdroop1" + "smpl_gm" ], "Coefficient":[ "-10000", "400", - "1200" + "1400" ], "HotThreshold":[ "NAN", @@ -148,38 +148,6 @@ "Multiplier":1, "Monitor":false }, - { - "Name":"vdroop1", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1200, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"vdroop2", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1200, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, { "Name":"smpl_gm", "Type":"BCL_VOLTAGE", From b765c3f825e4f2ea714af731791d6d6d435030f6 Mon Sep 17 00:00:00 2001 From: yixuanjiang Date: Fri, 12 Mar 2021 13:48:48 +0800 Subject: [PATCH 4/5] audio: Add PDM mic enabling flexibility fix the multi-channel recording creates fail issue Bug: 181849225 Bug: 174448901 Bug: 176208349 Test: verify by HW Oneal Signed-off-by: yixuanjiang Change-Id: I728ebb2633257583a245c61b559fba4ec726efd4 --- audio/oriole/config/mixer_paths.xml | 10 ++++----- audio/raven/config/mixer_paths.xml | 10 ++++----- audio/whitefin/config/mixer_paths.xml | 31 ++++++--------------------- 3 files changed, 16 insertions(+), 35 deletions(-) diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml index e0bc8fc..696b1da 100644 --- a/audio/oriole/config/mixer_paths.xml +++ b/audio/oriole/config/mixer_paths.xml @@ -637,8 +637,8 @@ - - + + @@ -647,7 +647,7 @@ - + @@ -688,8 +688,8 @@ - - + + diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml index e0bc8fc..696b1da 100644 --- a/audio/raven/config/mixer_paths.xml +++ b/audio/raven/config/mixer_paths.xml @@ -637,8 +637,8 @@ - - + + @@ -647,7 +647,7 @@ - + @@ -688,8 +688,8 @@ - - + + diff --git a/audio/whitefin/config/mixer_paths.xml b/audio/whitefin/config/mixer_paths.xml index ea557c9..ee676eb 100644 --- a/audio/whitefin/config/mixer_paths.xml +++ b/audio/whitefin/config/mixer_paths.xml @@ -605,6 +605,9 @@ + + + @@ -634,25 +637,21 @@ - - + + - - + - - - @@ -663,9 +662,6 @@ - - - @@ -676,9 +672,6 @@ - - - @@ -690,9 +683,6 @@ - - - @@ -703,9 +693,6 @@ - - - @@ -716,7 +703,6 @@ - @@ -727,8 +713,6 @@ - - @@ -739,9 +723,6 @@ - - - From 22181bf061e6e29bcf93025459326d4cc91b81a5 Mon Sep 17 00:00:00 2001 From: Peter Liu Date: Fri, 12 Mar 2021 11:46:57 -0800 Subject: [PATCH 5/5] Fix the high speed mode profile R4 and O6 supports high speed mode on logical(0) and main(2) camera currently. Since P21 only exposes rear logical camera, keep the high speed mode exposed only on rear logical camera too. Bug: 181600286 Test: CTS no regression android.hardware.cts.CameraTest#testImmediateZoom FAIL android.hardware.camera2.cts.CaptureRequestTest#testZoomRatio FAIL Tests Passed: 181, Failed: 2, Not found: 0, Status unknown: 0 Signed-off-by: Peter Liu Change-Id: I2a20596a83e3eb0a8a26bbc596aac6b7c25ff950 --- media_profiles_oriole.xml | 28 ---------------------------- media_profiles_raven.xml | 28 ---------------------------- 2 files changed, 56 deletions(-) diff --git a/media_profiles_oriole.xml b/media_profiles_oriole.xml index aff6517..a396302 100644 --- a/media_profiles_oriole.xml +++ b/media_profiles_oriole.xml @@ -408,20 +408,6 @@ channels="1" /> - - - @@ -539,20 +525,6 @@ channels="1" /> - - - diff --git a/media_profiles_raven.xml b/media_profiles_raven.xml index 909db37..dd0b2e9 100644 --- a/media_profiles_raven.xml +++ b/media_profiles_raven.xml @@ -408,20 +408,6 @@ channels="1" /> - - - @@ -539,20 +525,6 @@ channels="1" /> - - -