From e50ed5d4e6d983fbf490527c847144e103a61109 Mon Sep 17 00:00:00 2001
From: ramindani <ramindani@google.com>
Date: Thu, 29 Jun 2023 19:54:40 -0700
Subject: [PATCH] Upgrade Composer interface version

Test: device boots, atest libsurfacerflinger_unittest, atest VtsHalGraphicsComposer3_TargetTest
BUG: 284866749
BUG: 287517352
Change-Id: I803a4291c0839857f7e23696da7dac4c15a21e09
---
 compatibility_matrices/compatibility_matrix.9.xml | 2 +-
 graphics/Android.bp                               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compatibility_matrices/compatibility_matrix.9.xml b/compatibility_matrices/compatibility_matrix.9.xml
index 14b921004e..559e7c2a4b 100644
--- a/compatibility_matrices/compatibility_matrix.9.xml
+++ b/compatibility_matrices/compatibility_matrix.9.xml
@@ -248,7 +248,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>android.hardware.graphics.composer3</name>
-        <version>2</version>
+        <version>3</version>
         <interface>
             <name>IComposer</name>
             <instance>default</instance>
diff --git a/graphics/Android.bp b/graphics/Android.bp
index 2fbcb41c47..8a69f0950e 100644
--- a/graphics/Android.bp
+++ b/graphics/Android.bp
@@ -53,13 +53,13 @@ cc_defaults {
 cc_defaults {
     name: "android.hardware.graphics.composer3-ndk_static",
     static_libs: [
-        "android.hardware.graphics.composer3-V2-ndk",
+        "android.hardware.graphics.composer3-V3-ndk",
     ],
 }
 
 cc_defaults {
     name: "android.hardware.graphics.composer3-ndk_shared",
     shared_libs: [
-        "android.hardware.graphics.composer3-V2-ndk",
+        "android.hardware.graphics.composer3-V3-ndk",
     ],
 }