Snap for 7798373 from 2ee553798c76c50851c0034596793396533dad66 to mainline-wifi-release
Change-Id: I0bf8b4cca5c523cc94b6d477ee2b5a8fb64e2132
diff --git a/64bitonly/product/sdk_phone64_arm64.mk b/64bitonly/product/sdk_phone64_arm64.mk
index d665246..cd69897 100644
--- a/64bitonly/product/sdk_phone64_arm64.mk
+++ b/64bitonly/product/sdk_phone64_arm64.mk
@@ -40,6 +40,9 @@
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
+PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := \
+ development/sys-img/images_arm64-v8a_source.prop_template
+
#
# All components inherited here go to vendor or vendor_boot image
#
diff --git a/64bitonly/product/sdk_phone64_x86_64.mk b/64bitonly/product/sdk_phone64_x86_64.mk
index 2686954..ac55493 100644
--- a/64bitonly/product/sdk_phone64_x86_64.mk
+++ b/64bitonly/product/sdk_phone64_x86_64.mk
@@ -38,6 +38,9 @@
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
+PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := \
+ development/sys-img/images_x86_64_source.prop_template
+
#
# All components inherited here go to vendor image
#
diff --git a/camera/media_codecs_google_video_default.xml b/camera/media_codecs_google_video_default.xml
index 84e474c..cc5ba1f 100644
--- a/camera/media_codecs_google_video_default.xml
+++ b/camera/media_codecs_google_video_default.xml
@@ -122,18 +122,17 @@
<Feature name="adaptive-playback" />
</MediaCodec>
<MediaCodec name="c2.goldfish.vp8.decoder" type="video/x-vnd.on2.vp8">
- <Limit name="size" min="96x96" max="2560x560" />
+ <Limit name="size" min="96x96" max="2560x2560" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="24" max="2073600" />
<Limit name="bitrate" range="1-120000000" />
<Limit name="frame-rate" range="1-480" />
- <Limit name="performance-point-2560x2560" value="30" />
+ <Limit name="performance-point-1920x1080" value="30" />
<Limit name="measured-frame-rate-320x180" range="743-817" />
<Limit name="measured-frame-rate-640x360" range="237-258" />
<Limit name="measured-frame-rate-1280x720" range="60-160" />
<Limit name="measured-frame-rate-1920x1080" range="30-160" />
- <Limit name="measured-frame-rate-2560x2560" range="30-90" />
<Feature name="adaptive-playback" />
</MediaCodec>
<MediaCodec name="c2.goldfish.vp9.decoder" type="video/x-vnd.on2.vp9">
diff --git a/sepolicy/common/shell.te b/sepolicy/common/shell.te
index 9eba714..e3ac86c 100644
--- a/sepolicy/common/shell.te
+++ b/sepolicy/common/shell.te
@@ -2,3 +2,6 @@
allow shell aac_drc_prop:file { getattr map open };
allow shell device_config_runtime_native_boot_prop:file { getattr map open read };
allow shell adbd:{ socket vsock_socket } rw_socket_perms_no_ioctl;
+
+# Allow shell to read qemu.sf.lcd_density for CTS.
+get_prop(shell, qemu_sf_lcd_density_prop)
