From 6a062f176d25d09a43e4716a0faa8752cd0a7603 Mon Sep 17 00:00:00 2001 From: wenchangliu Date: Thu, 13 Apr 2023 06:41:32 +0000 Subject: [PATCH 1/9] Update same maximum resolution capability for hevc Bug: 275024348 Test: atest android.videocodec.cts.VideoEncoderMinMaxTest Change-Id: Ic3a1a31ebced2ede8e377494f3fc64e721a9a864 --- media_codecs_aosp_c2.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml index a35aba11..cddd6177 100644 --- a/media_codecs_aosp_c2.xml +++ b/media_codecs_aosp_c2.xml @@ -47,11 +47,11 @@ - + - - + + From 5b7374adf4045e9d34987270b82d9ce4bb49b53c Mon Sep 17 00:00:00 2001 From: wenchangliu Date: Mon, 17 Apr 2023 08:23:09 +0000 Subject: [PATCH 2/9] Update media_codecs_performance_c2.xml base on UP1A.230414 - add sw av1 encoder performance measure result from PVT device Bug: 271510425 Test: run cts -m CtsVideoTestCases -t android.video.cts.VideoEncoderDecoderTest Change-Id: I26515dd7d38f2e5c9fcfcf3abc0fbdffec342784 --- media_codecs_performance_c2.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml index 7000661b..d8f1f609 100644 --- a/media_codecs_performance_c2.xml +++ b/media_codecs_performance_c2.xml @@ -250,5 +250,13 @@ + + + + + + + + From b2bb140b1ff41e15c46aac63bbdb7edff2a39b9d Mon Sep 17 00:00:00 2001 From: Shuibing Dai Date: Thu, 13 Apr 2023 17:23:33 -0700 Subject: [PATCH 3/9] Enable updating country code from scan results for generic case Bug: 271928725 Bug: 267944733 Test: manually test Change-Id: I6f1f0ce3afdf203812965ede07422f454566f33d --- rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index 7fccdd15..bb57116d 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -158,4 +158,10 @@ true + + + true From 39764125a46aadd270d3f7299bdefa0638dc3195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Cl=C3=A9ment=20Tosi?= Date: Tue, 18 Apr 2023 11:25:52 +0100 Subject: [PATCH 4/9] gs101: Cover pvmfw.img in vbmeta_system.img The pvmfw partition is expected to be kept in sync with the system partition so, instead of having it as a standalone partition (covered by vbmeta.img), add it to vbmeta_system. Bug: 275497314 Test: TH Change-Id: I03f10699859ec8079ef2e2e4177f6cfa7f83d6d6 --- BoardConfig-common.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index fa3d102e..9be8d92f 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -133,6 +133,10 @@ BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 +ifneq ($(PRODUCT_BUILD_PVMFW_IMAGE),false) +BOARD_AVB_VBMETA_SYSTEM += pvmfw +endif + # Enable chained vbmeta for boot images BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA2048 From 659e45659715926e1d9be7c049b83f07bb64f4c6 Mon Sep 17 00:00:00 2001 From: Jerry Huang Date: Tue, 18 Apr 2023 19:50:36 +0800 Subject: [PATCH 5/9] gs101: update media_codecs_performance_c2.xml based on UP1A.230417.001 - add sw decoder performance measure result from DVT device Bug: 275148623 Test: run cts -m CtsMediaDecoderTestCases -a arm64-v8a -t android.media.decoder.cts.VideoDecoderPerfTest Change-Id: Ib839a12585393dc1dd07ed4f71632603bcc9b74b --- media_codecs_performance_c2.xml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml index d8f1f609..c25312be 100644 --- a/media_codecs_performance_c2.xml +++ b/media_codecs_performance_c2.xml @@ -152,16 +152,13 @@ - - - - - - - - - - + + + + + + + @@ -175,6 +172,12 @@ + + + + + + From 6968365b28142e601a8d65575ad9f7c76208773c Mon Sep 17 00:00:00 2001 From: Ian Elliott Date: Fri, 17 Mar 2023 16:33:38 -0600 Subject: [PATCH 6/9] gs101: Use SkiaVk as RenderEngine backend Re-enabling after fixing critical bug (b/274419744). Using SkiaVk saves boot-time memory (b/276962658). Test: no issues seen after enabling on Pixel 7 Pro Bug: 274419744 Bug: 276962658 Bug: 236390072 Change-Id: Iad0ff2a0bbde894724672b5b56846a8da005dde0 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 2699de45..cf12b257 100644 --- a/device.mk +++ b/device.mk @@ -261,7 +261,7 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ ro.opengles.version=196610 \ graphics.gpu.profiler.support=true \ - debug.renderengine.backend=skiaglthreaded + debug.renderengine.backend=skiavkthreaded # GRAPHICS - GPU (end) # #################### From f178319b4a867eb9b1e0fe898ef8933bd3c55303 Mon Sep 17 00:00:00 2001 From: Kyle Tso Date: Sat, 22 Apr 2023 14:38:13 +0800 Subject: [PATCH 7/9] usb: Temporarily disable compliance warning Revert me once the issue is fixed. Bug: 278018111 Change-Id: I198c4a42aa8b64fef90817474710295d68497dda Signed-off-by: Kyle Tso --- usb/usb/Usb.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index 74f6868c..7378fc11 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -819,7 +819,9 @@ void queryVersionHelper(android::hardware::usb::Usb *usb, status = getPortStatusHelper(usb, currentPortStatus); queryMoistureDetectionStatus(currentPortStatus); queryPowerTransferStatus(currentPortStatus); +#if 0 /* b/278018111 disable compliance warning; revert it after fixing the issue */ queryNonCompliantChargerStatus(currentPortStatus); +#endif if (usb->mCallback != NULL) { ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus, status); From f9a66edb94a75855a98d9ba8ec4217e06065121f Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 20 Apr 2023 18:23:20 +0800 Subject: [PATCH 8/9] Add device mk OWNERS Bug: 278167548 Change-Id: I21b4d706d64f50cd4ebf71a700b9a200c9afcc47 --- OWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OWNERS b/OWNERS index 4d9cf6e4..68657e89 100644 --- a/OWNERS +++ b/OWNERS @@ -1,2 +1,5 @@ per-file powerhint.json = wvw@google.com,joaodias@google.com,jenhaochen@google.com,rkganesh@google.com,jychen@google.com per-file powerhint.json = wvw@google.com,joaodias@google.com,jenhaochen@google.com,rkganesh@google.com,jychen@google.com + +# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. +per-file *.mk=file:device/google/gs-common:master:/OWNERS From c73936cc6a201cb4110fcc7c952b36ae1ccea7a0 Mon Sep 17 00:00:00 2001 From: Jerry Huang Date: Tue, 25 Apr 2023 14:42:20 +0800 Subject: [PATCH 9/9] gs101: update media_codecs_performance_c2.xml secure codec 1. performance point of non-secure codec should be the same as secure codec. 2. Update c2.android.vp9.decoder point Bug: 265359583 Test: run cts -m CtsMediaDecoderTestCases -a arm64-v8a -t android.media.decoder.cts.VideoDecoderPerfTest Change-Id: Icf084a9ed58babed76b0bb6ddbb93e3a8e1b4aef --- media_codecs_performance_c2.xml | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml index c25312be..e49ef219 100644 --- a/media_codecs_performance_c2.xml +++ b/media_codecs_performance_c2.xml @@ -142,14 +142,10 @@ - - - - - - - - + + + + @@ -162,15 +158,15 @@ - + - + - + - + - +