Snap for 10017868 from b8d621ebfe to udc-qpr1-release

Change-Id: I92dd8a8a0132eff5e95911b46dbc8beb712aaf7b
This commit is contained in:
Android Build Coastguard Worker 2023-04-28 01:06:54 +00:00
commit a4548f2b58
7 changed files with 49 additions and 27 deletions

View file

@ -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

3
OWNERS
View file

@ -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

View file

@ -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)
# ####################

View file

@ -47,11 +47,11 @@
<Feature name="can-swap-width-height" value="1" />
</MediaCodec>
<MediaCodec name="c2.exynos.hevc.decoder" type="video/hevc" >
<Limit name="size" min="64x64" max="3840x2160" />
<Limit name="size" min="64x64" max="3840x2176" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="block-count" range="1-32400" />
<Limit name="blocks-per-second" min="1" max="3888000" />
<Limit name="block-count" range="1-32640" />
<Limit name="blocks-per-second" min="1" max="3916800" />
<Limit name="bitrate" range="1-120000000" />
<Limit name="performance-point-1280x720" range="240" />
<Limit name="performance-point-3840x2160" range="120" />

View file

@ -142,38 +142,37 @@
<Limit name="measured-frame-rate-1920x1080" range="38-41" /> <!-- v90%=1.0 -->
</MediaCodec>
<MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
<!-- measured 90%:440-463 med:441 N=2 -->
<Limit name="measured-frame-rate-320x180" range="440-452" /> <!-- v90%=1.0 -->
<!-- measured 90%:232-234 med:233 N=2 -->
<Limit name="measured-frame-rate-640x360" range="232-233" /> <!-- v90%=1.0 -->
<!-- measured 90%:63-64 med:63 N=2 -->
<Limit name="measured-frame-rate-1280x720" range="63-63" /> <!-- v90%=1.0 -->
<!-- measured 90%:39-40 med:39 N=2 -->
<Limit name="measured-frame-rate-1920x1080" range="39-40" /> <!-- v90%=1.0 -->
<Limit name="measured-frame-rate-320x180" range="951-1032" />
<Limit name="measured-frame-rate-640x360" range="324-374" />
<Limit name="measured-frame-rate-1280x720" range="128-131" />
<Limit name="measured-frame-rate-1920x1080" range="65-75" />
</MediaCodec>
<MediaCodec name="c2.google.av1.decoder" type="video/av01" update="true">
<!-- measured 90%:295-301 med:296 N=2 -->
<Limit name="measured-frame-rate-352x288" range="295-298" /> <!-- v90%=1.0 -->
<!-- measured 90%:196-207 med:196 N=2 -->
<Limit name="measured-frame-rate-640x360" range="196-201" /> <!-- v90%=1.0 -->
<!-- measured 90%:177-180 med:178 N=2 -->
<Limit name="measured-frame-rate-720x480" range="177-178" /> <!-- v90%=1.0 -->
<!-- measured 90%:81-82 med:82 N=2 -->
<Limit name="measured-frame-rate-1280x720" range="81-82" /> <!-- v90%=1.0 -->
<!-- measured 90%:45-47 med:46 N=2 -->
<Limit name="measured-frame-rate-1920x1080" range="45-46" /> <!-- v90%=1.0 -->
<Limit name="measured-frame-rate-352x288" range="410-416" /> <!-- N=20 v90%=1.7 -->
<!-- measured 90%:251-660 med:361 SLOW -->
<Limit name="measured-frame-rate-640x360" range="361-407" /> <!-- N=20 v90%=1.6 -->
<!-- measured 90%:250-684 med:366 SLOW -->
<Limit name="measured-frame-rate-720x480" range="366-414" /> <!-- N=20 v90%=1.7 -->
<Limit name="measured-frame-rate-1280x720" range="252-259" /> <!-- N=22 v90%=1.1 -->
<Limit name="measured-frame-rate-1920x1080" range="210-213" /> <!-- N=20 v90%=1.1 -->
</MediaCodec>
<MediaCodec name="c2.google.av1.decoder.secure" type="video/av01" update="true">
<!-- measured 90%:295-301 med:296 N=2 -->
<Limit name="measured-frame-rate-352x288" range="295-298" /> <!-- v90%=1.0 -->
<Limit name="measured-frame-rate-352x288" range="410-416" /> <!-- v90%=1.0 -->
<!-- measured 90%:196-207 med:196 N=2 -->
<Limit name="measured-frame-rate-640x360" range="196-201" /> <!-- v90%=1.0 -->
<Limit name="measured-frame-rate-640x360" range="361-407" /> <!-- v90%=1.0 -->
<!-- measured 90%:177-180 med:178 N=2 -->
<Limit name="measured-frame-rate-720x480" range="177-178" /> <!-- v90%=1.0 -->
<Limit name="measured-frame-rate-720x480" range="366-414" /> <!-- v90%=1.0 -->
<!-- measured 90%:81-82 med:82 N=2 -->
<Limit name="measured-frame-rate-1280x720" range="81-82" /> <!-- v90%=1.0 -->
<Limit name="measured-frame-rate-1280x720" range="252-259" /> <!-- v90%=1.0 -->
<!-- measured 90%:45-47 med:46 N=2 -->
<Limit name="measured-frame-rate-1920x1080" range="45-46" /> <!-- v90%=1.0 -->
<Limit name="measured-frame-rate-1920x1080" range="210-213" /> <!-- v90%=1.0 -->
</MediaCodec>
<MediaCodec name="c2.android.av1.decoder" type="video/av01" update="true">
<Limit name="measured-frame-rate-352x288" range="353-362" />
<Limit name="measured-frame-rate-640x360" range="178-210" />
<Limit name="measured-frame-rate-720x480" range="101-129" />
<Limit name="measured-frame-rate-1280x720" range="38-40" />
</MediaCodec>
</Decoders>
@ -250,5 +249,13 @@
<Limit name="measured-frame-rate-640x360" range="64-97" />
<Limit name="measured-frame-rate-1280x720" range="16-24" />
</MediaCodec>
<MediaCodec name="c2.android.av1.encoder" type="video/av01" update="true">
<!-- measured 90%:297-298 med:298 N=2 -->
<Limit name="measured-frame-rate-320x240" range="297-298" /> <!-- v90%=1.0 -->
<!-- measured 90%:65-66 med:66 N=2 -->
<Limit name="measured-frame-rate-720x480" range="65-66" /> <!-- v90%=1.0 -->
<!-- measured 90%:24-25 med:25 N=2 -->
<Limit name="measured-frame-rate-1280x720" range="24-25" /> <!-- v90%=1.0 -->
</MediaCodec>
</Encoders>
</MediaCodecs>

View file

@ -158,4 +158,10 @@
<!-- Enable the feature of adjusting link layer stats polling interval based on
device mobility state and client mode RSSI monitoring. -->
<bool translatable="false" name="config_wifiAdjustPollRssiIntervalEnabled">true</bool>
<!-- Boolean indicating whether the framework updates country from scan results when there is
no telephony country code. This is applied to all generic cases and might require the
regulatory approval (for example, FCC pre-approval is required according to "594280 D01
Software Configuration Control v02r01").-->
<bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultGeneric">true</bool>
</resources>

View file

@ -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);