commit 5967aec46df4cfae38f26e0c30ab4f2442a7a801
author Leon Scroggins III <scroggo@google.com> Wed Dec 29 11:14:22 2021 -0500
committer Leon Scroggins III <scroggo@google.com> Wed Dec 29 15:07:06 2021 -0500
tree cf1c2765a761a5cf3d67d86e4621c33111af6eba
parent cf7a7b25c70e410791d6182e579f6db2eeb3556b

Switch from HIDL DisplayCapability to AIDL

In preparation for adding a new DisplayCapability which is only in AIDL.
This change is almost completely mechanical, and should have no impact
on behavior.

Similar to I1f923fcc8d8e6dff388493a76e31d435638b5255 for Composition.

Bug: 193170859
Test: existing tests
Change-Id: I448d5d0ec71f99fb3cbfbe505ded40ab37f6083b

services/surfaceflinger/DisplayHardware/HWComposer.h

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.h b/services/surfaceflinger/DisplayHardware/HWComposer.h
index b7f1064..69adfcd 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.h
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.h
@@ -44,6 +44,7 @@
 #include "Hal.h"
 
 #include <aidl/android/hardware/graphics/composer3/Composition.h>
+#include <aidl/android/hardware/graphics/composer3/DisplayCapability.h>
 
 namespace android {
 
@@ -110,7 +111,9 @@
                                               DisplayIdentificationData* outData) const = 0;
 
     virtual bool hasCapability(hal::Capability) const = 0;
-    virtual bool hasDisplayCapability(HalDisplayId, hal::DisplayCapability) const = 0;
+    virtual bool hasDisplayCapability(
+            HalDisplayId,
+            aidl::android::hardware::graphics::composer3::DisplayCapability) const = 0;
 
     virtual size_t getMaxVirtualDisplayCount() const = 0;
     virtual size_t getMaxVirtualDisplayDimension() const = 0;
@@ -267,7 +270,9 @@
                                       DisplayIdentificationData* outData) const override;
 
     bool hasCapability(hal::Capability) const override;
-    bool hasDisplayCapability(HalDisplayId, hal::DisplayCapability) const override;
+    bool hasDisplayCapability(
+            HalDisplayId,
+            aidl::android::hardware::graphics::composer3::DisplayCapability) const override;
 
     size_t getMaxVirtualDisplayCount() const override;
     size_t getMaxVirtualDisplayDimension() const override;