From 495567bb434d485bf8720ee7e290aab06541b3b6 Mon Sep 17 00:00:00 2001
From: wenchangliu <wenchangliu@google.com>
Date: Tue, 20 Sep 2022 18:31:19 +0800
Subject: [PATCH 1/3] [DO NOT MERGE] temporal remove CQ mode for HEVC encoder

We are too late to upgrade the latest version of libyuv in Android T
to fix color conversion (BT.709 YUV to RGB) accuracy issue in HeifWriterTest when we exposed CQ mode for H/W hevc encoder. Move CQ mode support in Android U.

Note: remove CQ mode support, HeifWriterTest will use software hevc encoder to run the test. Since software encoder only support 512x512 resolution the default color primary is using BT.601 which will not
meet color accuracy issue.

Bug: 242466144
Test: atest android.media.misc.cts.HeifWriterTest
Change-Id: I4e0cf6995980603c9473086a385617e47a16b4b9
---
 media_codecs_aosp_c2.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml
index a35aba11..31842ff8 100644
--- a/media_codecs_aosp_c2.xml
+++ b/media_codecs_aosp_c2.xml
@@ -166,11 +166,10 @@
             <Limit name="performance-point-1280x720" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
-            <Limit name="quality" range="0-100" default="57" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="vq-minimum-quality"/>
             <Feature name="qp-bounds"/>
-            <Feature name="bitrate-modes" value="VBR,CBR,CQ,CBR-FD" />
+            <Feature name="bitrate-modes" value="VBR,CBR,CBR-FD" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.mpeg4.encoder" type="video/mp4v-es">
             <Limit name="size" min="32x32" max="2048x2048" />

From 01a942fe3a8355828c0f110aefe65c1a9a8e8991 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Tue, 20 Sep 2022 16:26:34 -0700
Subject: [PATCH 2/3] Delete HALs that are already in VINTF fragments
 (google_battery) (2/2)

These HALs are already included in VINTF fragments, so
there's no need to be specified here.

Test: TH
Bug: 148808037
Change-Id: Iaa719867c7318a5a1bb180430346ffb50852e556
Merged-In: Iaa719867c7318a5a1bb180430346ffb50852e556
---
 manifest_64.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/manifest_64.xml b/manifest_64.xml
index a8b512be..4d67efcc 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -125,14 +125,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl">
-        <name>vendor.google.google_battery</name>
-        <version>1</version>
-        <interface>
-            <name>IGoogleBattery</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
        <name>vendor.google.whitechapel.audio.audioext</name>
        <transport>hwbinder</transport>

From def0f3259b6de7567bddb09cad76936e0535edb4 Mon Sep 17 00:00:00 2001
From: Habib Moukalled <habibm@google.com>
Date: Wed, 14 Sep 2022 12:54:55 +0000
Subject: [PATCH 3/3] Upgrade device VINTF manifest for IDebugHost

Notes:
- Update the HAL version in VINTF manifest from
AIDL 1.0 to AIDL 2.0

Bug: 245126454
Test: E2E auth enroll, atests
Change-Id: I75bde5164ecb9b7a51088ba5ea4dd6ebbfce9566
(cherry picked from commit 7a25196bf52dd758dacb5845a229f2e102f17069)
---
 device_framework_matrix_product.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 158951a4..a9f026ee 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -58,6 +58,7 @@
     </hal>
     <hal format="aidl" optional="true">
       <name>com.google.face.debug</name>
+      <version>2</version>
         <interface>
             <name>IDebugHost</name>
             <instance>default</instance>