Merge "Sync with new API to start HDCP" into main
diff --git a/hwc3/ComposerClient.cpp b/hwc3/ComposerClient.cpp
index fd4dedc..124f5ea 100644
--- a/hwc3/ComposerClient.cpp
+++ b/hwc3/ComposerClient.cpp
@@ -1293,6 +1293,11 @@
return ToBinderStatus(hwc3::Error::kUnsupported);
}
+ndk::ScopedAStatus ComposerClient::startHdcpNegotiation(
+ int64_t /*display*/, const AidlHdcpLevels& /*levels*/) {
+ return ToBinderStatus(hwc3::Error::kUnsupported);
+}
+
#endif
ndk::ScopedAStatus ComposerClient::getMaxLayerPictureProfiles(int64_t, int32_t*) {
diff --git a/hwc3/ComposerClient.h b/hwc3/ComposerClient.h
index 45f0a4c..e287d58 100644
--- a/hwc3/ComposerClient.h
+++ b/hwc3/ComposerClient.h
@@ -25,6 +25,7 @@
#include "hwc3/Utils.h"
#include "utils/Mutex.h"
+using AidlHdcpLevels = aidl::android::hardware::drm::HdcpLevels;
using AidlPixelFormat = aidl::android::hardware::graphics::common::PixelFormat;
using AidlNativeHandle = aidl::android::hardware::common::NativeHandle;
@@ -149,6 +150,8 @@
ndk::ScopedAStatus notifyExpectedPresent(
int64_t display, const ClockMonotonicTimestamp& expected_present_time,
int32_t frame_interval_ns) override;
+ ndk::ScopedAStatus startHdcpNegotiation(int64_t display,
+ const AidlHdcpLevels& levels) override;
#endif