From b5cd40183060f18396d42bc21ec3c8a52522b60e Mon Sep 17 00:00:00 2001
From: Ian Elliott <ianelliott@google.com>
Date: Fri, 5 May 2023 02:07:56 +0000
Subject: [PATCH 1/3] Revert "gs201: Use SkiaVk as RenderEngine backend"

This reverts commit adb2d7a0bdb6ce3460dc0a56926f5737f554c09c.

Reason for revert: Blocking Droidfood: b/280568588

Bug: 280568588
Change-Id: I0ad1c3eb057122f3b38fdf197c80d379b021960e
---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index 04f5fcd3..fd40ac58 100644
--- a/device.mk
+++ b/device.mk
@@ -285,7 +285,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.opengles.version=196610 \
 	graphics.gpu.profiler.support=true \
-	debug.renderengine.backend=skiavkthreaded
+	debug.renderengine.backend=skiaglthreaded
 
 # GRAPHICS - GPU (end)
 # ####################

From 45dc0d098a0da19bc893bf4cd8d7d06ab6318a1d Mon Sep 17 00:00:00 2001
From: Peiyong Lin <lpy@google.com>
Date: Wed, 26 Apr 2023 01:22:03 +0000
Subject: [PATCH 2/3] Update device.mk.

USE_ANGLE in moved to core.mk across platform, this patch updated the
usage of it in device.mk.

Bug: 270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I58d57cd5e58d0a4706e8771ffb5e903795954f19
---
 BoardConfig-common.mk |  3 ---
 device.mk             | 14 --------------
 2 files changed, 17 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 807e60c6..92dab880 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -124,9 +124,6 @@ BOARD_USES_GRALLOC_ION_SYNC := true
 # This should be the same value as USE_SWIFTSHADER in device.mk
 BOARD_USES_SWIFTSHADER := false
 
-# This should be the same value as USE_ANGLE in device.mk
-BOARD_USES_ANGLE := false
-
 # Gralloc4
 ifeq ($(BOARD_USES_SWIFTSHADER),true)
 $(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,true)
diff --git a/device.mk b/device.mk
index fd40ac58..afab0540 100644
--- a/device.mk
+++ b/device.mk
@@ -211,9 +211,6 @@ USES_GAUDIO := true
 # Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk
 USE_SWIFTSHADER := false
 
-# by default, USE_ANGLE is false
-USE_ANGLE ?= false
-
 # HWUI
 TARGET_USES_VULKAN = true
 
@@ -250,13 +247,6 @@ PRODUCT_PACKAGES += \
    libGLESv2_swiftshader
 endif
 
-ifeq ($(USE_ANGLE),true)
-PRODUCT_PACKAGES += \
-	libEGL_angle \
-	libGLESv1_CM_angle \
-	libGLESv2_angle
-endif
-
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \
 	frameworks/native/data/etc/android.hardware.vulkan.version-1_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
@@ -268,10 +258,6 @@ PRODUCT_COPY_FILES += \
 ifeq ($(USE_SWIFTSHADER),true)
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.hardware.egl = swiftshader
-else ifeq ($(USE_ANGLE),true)
-PRODUCT_VENDOR_PROPERTIES += \
-	ro.hardware.egl = angle \
-	ro.hardware.egl_legacy = mali
 else
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.hardware.egl = mali

From 8b9effdddcf0f1082f1010a0c3e17230e8c7d105 Mon Sep 17 00:00:00 2001
From: chengfeitao <chengfeitao@google.com>
Date: Wed, 26 Apr 2023 18:39:32 +0000
Subject: [PATCH 3/3] Replace slowJepg build time overlay with runtime overlay

Use runtime resource overlay instead of build time
config overlay so that P21 and later devices are covered
automatically

Bug: 274172776
Test: Manual testing with Messenger app video call
Change-Id: I0ade7915271a3de67a3dcf8815b4dba1b16900a0
---
 overlay/frameworks/base/core/res/res/values/config.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index b6a8951e..1f1bceac 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -289,10 +289,4 @@
         <item>"com.shannon.imsservice"</item>
         <item>"com.android.phone"</item>
     </string-array>
-
-    <!-- The list of packages to force slowJpegMode for Apps using Camera API1 -->
-    <string-array name="config_forceSlowJpegModeList" translatable="false">
-        <item>com.facebook.orca</item>
-        <item>com.skype.raider</item>
-    </string-array>
 </resources>