From 78809a24e768f18a771fb668dfd05d85ea5d696b Mon Sep 17 00:00:00 2001 From: Shin-Yu Wang Date: Mon, 19 Feb 2024 08:29:10 +0000 Subject: [PATCH 1/3] Update the idle timer setting Bug: 307588292 Test: adb shell getprop | grep idle_timer Change-Id: I77f4ac9bc0b15015bb13004be1fd58fb65b4cc99 --- device-tokay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-tokay.mk b/device-tokay.mk index 3ca68980..39127b4f 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -45,7 +45,7 @@ $(call soong_config_set,google3a_config,target_device,tokay) # display DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1000 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true # Init files From 06c566503ca7b604827b5c4348c68f6196212e92 Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Wed, 21 Feb 2024 03:56:10 +0000 Subject: [PATCH 2/3] audio: fix vts for microphone information. note: Depending the realized in framework side, the microhone information only report the corresponding devices info surfaced via SDK. That means reporting bottom / back mic are necessary. Test: atest VtsHalAudioCoreTargetTest Bug: 300735639 Change-Id: Ib514d1f87f607d1bfab0818dbff16bd3623b313e --- .../audio_platform_configuration.xml | 101 ------------------ .../audio_platform_configuration.xml | 101 ------------------ .../audio_platform_configuration.xml | 101 ------------------ 3 files changed, 303 deletions(-) diff --git a/audio/caiman/aidl_config/audio_platform_configuration.xml b/audio/caiman/aidl_config/audio_platform_configuration.xml index 758650fa..42f18c33 100644 --- a/audio/caiman/aidl_config/audio_platform_configuration.xml +++ b/audio/caiman/aidl_config/audio_platform_configuration.xml @@ -315,107 +315,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/komodo/aidl_config/audio_platform_configuration.xml b/audio/komodo/aidl_config/audio_platform_configuration.xml index 758650fa..42f18c33 100644 --- a/audio/komodo/aidl_config/audio_platform_configuration.xml +++ b/audio/komodo/aidl_config/audio_platform_configuration.xml @@ -315,107 +315,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/tokay/aidl_config/audio_platform_configuration.xml b/audio/tokay/aidl_config/audio_platform_configuration.xml index 758650fa..42f18c33 100644 --- a/audio/tokay/aidl_config/audio_platform_configuration.xml +++ b/audio/tokay/aidl_config/audio_platform_configuration.xml @@ -315,107 +315,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From d0e4bc5a18c5c2594d73d35f021a97ba41825f29 Mon Sep 17 00:00:00 2001 From: Frank Yu Date: Wed, 21 Feb 2024 18:16:10 +0800 Subject: [PATCH 3/3] update coex table Test: Manual Bug: 326172562 Change-Id: I8171980651da8f9b416a4a014ab54b65cedf8376 --- device-tokay.mk | 3 +- .../coex/display_primary_mipi_coex_table.csv | 36 +++++++++---------- .../coex/display_primary_mipi_coex_table.csv | 36 +++++++++---------- radio/tokay/coex/Android.bp | 8 +++++ .../coex/display_primary_mipi_coex_table.csv | 34 +++++++++--------- .../coex/display_primary_ssc_coex_table.csv | 6 ++++ 6 files changed, 69 insertions(+), 54 deletions(-) create mode 100644 radio/tokay/coex/display_primary_ssc_coex_table.csv diff --git a/device-tokay.mk b/device-tokay.mk index 39127b4f..9cd57503 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -96,7 +96,8 @@ PRODUCT_PACKAGES += \ camera_front_mipi_coex_table \ camera_rear_main_mipi_coex_table \ camera_rear_wide_mipi_coex_table \ - display_primary_mipi_coex_table + display_primary_mipi_coex_table \ + display_primary_ssc_coex_table # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ diff --git a/radio/caiman/coex/display_primary_mipi_coex_table.csv b/radio/caiman/coex/display_primary_mipi_coex_table.csv index c8357d37..885a0440 100644 --- a/radio/caiman/coex/display_primary_mipi_coex_table.csv +++ b/radio/caiman/coex/display_primary_mipi_coex_table.csv @@ -1,19 +1,19 @@ -1368000,1288000 -SNH,1368000 -CHA,1368000 +684000,644000 +SNH,684000 +CHA,684000 -642000,646000,1368000 -805000,806000,1368000 -1930000,1933000,1368000 -2415000,2422000,1368000 -2576000,2578000,1368000 -3864000,3868000,1368000 -4546000,4548000,1368000 -5796000,5805000,1368000 -7075000,7084000,1368000 -1525000,1559000,1288000 -2172000,2174000,1288000 -2193000,2195000,1288000 -3415000,3425000,1288000 -4740000,4742000,1288000 -6155000,6156000,1288000 \ No newline at end of file +642000,646000,684000 +805000,806000,684000 +1930000,1933000,684000 +2415000,2422000,684000 +2576000,2578000,684000 +3864000,3868000,684000 +4546000,4548000,684000 +5796000,5805000,684000 +7075000,7084000,684000 +1525000,1559000,644000 +2172000,2174000,644000 +2193000,2195000,644000 +3415000,3425000,644000 +4740000,4742000,644000 +6155000,6156000,644000 \ No newline at end of file diff --git a/radio/komodo/coex/display_primary_mipi_coex_table.csv b/radio/komodo/coex/display_primary_mipi_coex_table.csv index c8357d37..f383da0e 100644 --- a/radio/komodo/coex/display_primary_mipi_coex_table.csv +++ b/radio/komodo/coex/display_primary_mipi_coex_table.csv @@ -1,19 +1,19 @@ -1368000,1288000 -SNH,1368000 -CHA,1368000 +684000,6440000 +SNH,684000 +CHA,684000 -642000,646000,1368000 -805000,806000,1368000 -1930000,1933000,1368000 -2415000,2422000,1368000 -2576000,2578000,1368000 -3864000,3868000,1368000 -4546000,4548000,1368000 -5796000,5805000,1368000 -7075000,7084000,1368000 -1525000,1559000,1288000 -2172000,2174000,1288000 -2193000,2195000,1288000 -3415000,3425000,1288000 -4740000,4742000,1288000 -6155000,6156000,1288000 \ No newline at end of file +642000,646000,684000 +805000,806000,684000 +1930000,1933000,684000 +2415000,2422000,684000 +2576000,2578000,684000 +3864000,3868000,684000 +4546000,4548000,684000 +5796000,5805000,684000 +7075000,7084000,684000 +1525000,1559000,6440000 +2172000,2174000,6440000 +2193000,2195000,6440000 +3415000,3425000,6440000 +4740000,4742000,6440000 +6155000,6156000,6440000 \ No newline at end of file diff --git a/radio/tokay/coex/Android.bp b/radio/tokay/coex/Android.bp index 1366f017..e2819986 100644 --- a/radio/tokay/coex/Android.bp +++ b/radio/tokay/coex/Android.bp @@ -59,3 +59,11 @@ prebuilt_etc { src: "display_primary_mipi_coex_table.csv", relative_install_path: "modem", } + +prebuilt_etc { + name: "display_primary_ssc_coex_table", + filename: "display_primary_ssc_coex_table.csv", + vendor: true, + src: "display_primary_ssc_coex_table.csv", + relative_install_path: "modem", +} diff --git a/radio/tokay/coex/display_primary_mipi_coex_table.csv b/radio/tokay/coex/display_primary_mipi_coex_table.csv index 78b425e5..7768ce6d 100644 --- a/radio/tokay/coex/display_primary_mipi_coex_table.csv +++ b/radio/tokay/coex/display_primary_mipi_coex_table.csv @@ -1,18 +1,18 @@ -756000,776000 -SNH,756000 -CHA,756000 +378000,388000 +SNH,378000 +CHA,378000 -772000,781000,756000 -1547000,1557000,756000 -1935000,1945000,756000 -3487000,3497000,756000 -5815000,5825000,756000 -751000,761000,776000 -940000,950000,776000 -1531000,1533000,776000 -1890000,1900000,776000 -2641000,2651000,776000 -3397000,3407000,776000 -4153000,4163000,776000 -4931000,4941000,776000 -4645000,4655000,776000 \ No newline at end of file +772000,781000,378000 +1547000,1557000,378000 +1935000,1945000,378000 +3487000,3497000,378000 +5815000,5825000,378000 +751000,761000,388000 +940000,950000,388000 +1531000,1533000,388000 +1890000,1900000,388000 +2641000,2651000,388000 +3397000,3407000,388000 +4153000,4163000,388000 +4931000,4941000,388000 +4645000,4655000,388000 \ No newline at end of file diff --git a/radio/tokay/coex/display_primary_ssc_coex_table.csv b/radio/tokay/coex/display_primary_ssc_coex_table.csv new file mode 100644 index 00000000..2f2d32fa --- /dev/null +++ b/radio/tokay/coex/display_primary_ssc_coex_table.csv @@ -0,0 +1,6 @@ +1,0 +SNH,0 +CHA,0 + +636000,644000,1 +764000,768000,1 \ No newline at end of file