From f973f14bc911f9e6e7188a91824e832cccd6dde4 Mon Sep 17 00:00:00 2001
From: Jack Wu <wjack@google.com>
Date: Sat, 4 Mar 2023 13:38:39 +0800
Subject: [PATCH 1/2] Revert "Revert "gs201: update AIDL IGoogleBattery
 manifest version to 2""

Bug: 271224032
Test: TH
This reverts commit 3a0fbc172752357051c3d5b229a377ec1ca48ecb.

Change-Id: I4cc4da5ca239bb8140f9ba2843c4748b4f04c34c
---
 device_framework_matrix_product.xml | 2 +-
 manifest-gralloc3.xml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index b55e69eb..d48ceba7 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -137,7 +137,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.google_battery</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IGoogleBattery</name>
             <instance>default</instance>
diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
index 852c76f0..9ecea758 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.xml
@@ -133,7 +133,7 @@
     </hal>
     <hal format="aidl">
         <name>vendor.google.google_battery</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IGoogleBattery</name>
             <instance>default</instance>

From 2fa6ce1ba2ff2e1d6b3ee3a61086e04d0bf199a2 Mon Sep 17 00:00:00 2001
From: Ian Elliott <ianelliott@google.com>
Date: Tue, 20 Dec 2022 15:06:20 -0700
Subject: [PATCH 2/2] Pixel 7 Pro: Use SkiaVk as RenderEngine backend

Test: make, flash, and run applications/tests
Bug: 236390072
Change-Id: I047b827a585776cfd759fa000cd2c7d1a3842ff6
---
 device.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/device.mk b/device.mk
index 68cbbaf0..4f01b35e 100644
--- a/device.mk
+++ b/device.mk
@@ -265,8 +265,15 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.opengles.version=196610 \
-	graphics.gpu.profiler.support=true \
-	debug.renderengine.backend=skiaglthreaded \
+	graphics.gpu.profiler.support=true
+# Enable SkiaVk for RenderEngine on Cheetah
+ifneq (,$(filter %cheetah, $(TARGET_PRODUCT)))
+PRODUCT_VENDOR_PROPERTIES += \
+	debug.renderengine.backend=skiavkthreaded
+else
+PRODUCT_VENDOR_PROPERTIES += \
+	debug.renderengine.backend=skiaglthreaded
+endif
 
 # GRAPHICS - GPU (end)
 # ####################