diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-10 16:06:06 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-10 16:06:06 +0000 |
| commit | 1f02639732be0ac743f63ab237a44de6b0e05ab5 (patch) | |
| tree | b05fe884d05bac2839e86d2843efe60f4fc70836 | |
| parent | 7b8946b25220818c50cb2d8536e9b3d558b7f3ef (diff) | |
| parent | 56e11ccdda8b204f37ff9935cb0536bab3247fd9 (diff) | |
| download | redbull-1f02639732be0ac743f63ab237a44de6b0e05ab5.tar.gz | |
Snap for 10103804 from 56e11ccdda8b204f37ff9935cb0536bab3247fd9 to mainline-tzdata5-release
Change-Id: I671f0f9ca8751d1f997ead1419e487e8ce664d88
| -rw-r--r-- | default-permissions.xml | 2 | ||||
| -rw-r--r-- | device-common.mk | 11 | ||||
| -rw-r--r-- | media_codecs_performance_c2.xml | 14 |
3 files changed, 21 insertions, 6 deletions
diff --git a/default-permissions.xml b/default-permissions.xml index a29300ae..e792f5cd 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -81,6 +81,8 @@ <!-- Location --> <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/> <permission name="android.permission.ACCESS_BACKGROUND_LOCATION" fixed="false"/> + <!-- Battery Widget --> + <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/> </exception> <exception package="com.google.android.apps.camera.services"> diff --git a/device-common.mk b/device-common.mk index 133411c9..6c1b4f40 100644 --- a/device-common.mk +++ b/device-common.mk @@ -83,7 +83,8 @@ PRODUCT_COPY_FILES += \ device/google/redbull/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \ device/google/redbull/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ - frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml + frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml \ + frameworks/native/data/etc/android.software.ipsec_tunnel_migration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnel_migration.xml # Enforce privapp-permissions whitelist PRODUCT_PROPERTY_OVERRIDES += \ @@ -102,7 +103,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk) PRODUCT_CHARACTERISTICS := nosdcard PRODUCT_SHIPPING_API_LEVEL := 30 BOARD_SHIPPING_API_LEVEL := 30 -BOARD_API_LEVEL := 33 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay @@ -430,9 +430,8 @@ PRODUCT_SOONG_NAMESPACES += vendor/qcom/proprietary/bluetooth/hidl_client # DRM HAL PRODUCT_PACKAGES += \ - android.hardware.drm-service.clearkey - --include vendor/widevine/libwvdrmengine/apex/device/device.mk + android.hardware.drm-service.clearkey \ + android.hardware.drm-service.widevine-v17 # NFC and Secure Element packages PRODUCT_PACKAGES += \ @@ -846,7 +845,7 @@ PRODUCT_PACKAGES += $(HIDL_WRAPPER) # Increment the SVN for any official public releases ifeq ($(PRODUCT_DEVICE_SVN_OVERRIDE),) PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=63 + ro.vendor.build.svn=67 endif # Enable iwlan service logging for debug diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml index d143855d..80efc855 100644 --- a/media_codecs_performance_c2.xml +++ b/media_codecs_performance_c2.xml @@ -176,6 +176,12 @@ <Limit name="measured-frame-rate-480x360" range="501-752" /> <Limit name="measured-frame-rate-1280x720" range="189-284" /> </MediaCodec> + <MediaCodec name="c2.android.av1.decoder" type="video/av01" update="true"> + <Limit name="measured-frame-rate-352x288" range="323-351" /> + <Limit name="measured-frame-rate-640x360" range="180-185" /> + <Limit name="measured-frame-rate-720x480" range="113-114" /> + <Limit name="measured-frame-rate-1280x720" range="54-54" /> + </MediaCodec> </Decoders> <Encoders> @@ -251,5 +257,13 @@ <!-- measured 95%:16-26 med:20/20 N=32 --> <Limit name="measured-frame-rate-1280x720" range="20-20" /> <!-- v95%=1.3 --> </MediaCodec> + <MediaCodec name="c2.android.av1.encoder" type="video/av01" update="true"> + <!-- measured 90%:225-240 med:237 N=4 --> + <Limit name="measured-frame-rate-320x240" range="232-232" /> <!-- v90%=1.0 --> + <!-- measured 90%:52-59 med:58 N=4 --> + <Limit name="measured-frame-rate-720x480" range="56-56" /> <!-- v90%=1.1 --> + <!-- measured 90%:21-26 med:25 N=4 --> + <Limit name="measured-frame-rate-1280x720" range="23-23" /> <!-- v90%=1.1 --> + </MediaCodec> </Encoders> </MediaCodecs> |