From 57d43b853f287b994d8365bea6a9ca05d01cbe71 Mon Sep 17 00:00:00 2001
From: Andrew Wolfers <aswolfers@google.com>
Date: Tue, 11 Nov 2025 17:09:37 +0000
Subject: [PATCH] Convert to Android-style logging and cleanup log includes

Change-Id: Ic2673ad6f474bd593fa1c5023e50a4120ba3ce95
---
 hwc3/Composer.cpp       | 2 --
 hwc3/ComposerClient.cpp | 6 +++---
 hwc3/Utils.h            | 3 ++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hwc3/Composer.cpp b/hwc3/Composer.cpp
index 17e1ec8..1250ed3 100644
--- a/hwc3/Composer.cpp
+++ b/hwc3/Composer.cpp
@@ -19,12 +19,10 @@
 
 #include "Composer.h"
 
-#include <android-base/logging.h>
 #include <android/binder_ibinder_platform.h>
 
 #include "hwc3/ComposerClient.h"
 #include "hwc3/Utils.h"
-#include "utils/log.h"
 #include "utils/properties.h"
 
 using ::android::drm_hwcomposer::Properties;
diff --git a/hwc3/ComposerClient.cpp b/hwc3/ComposerClient.cpp
index 9c86501..9a1604c 100644
--- a/hwc3/ComposerClient.cpp
+++ b/hwc3/ComposerClient.cpp
@@ -34,7 +34,6 @@
 #include <aidl/android/hardware/graphics/composer3/PresentOrValidate.h>
 #include <aidl/android/hardware/graphics/composer3/RenderIntent.h>
 #include <aidlcommonsupport/NativeHandle.h>
-#include <android-base/logging.h>
 #include <android/binder_auto_utils.h>
 #include <android/binder_ibinder_platform.h>
 #include <cutils/native_handle.h>
@@ -50,6 +49,7 @@
 #include "hwc3/Utils.h"
 #include "stats/CompositionStatsAtomReporter.h"
 #include "stats/CompositionStatsPoller.h"
+#include "utils/log.h"
 
 using ::android::drm_hwcomposer::BufferBlendMode;
 using ::android::drm_hwcomposer::BufferColorSpace;
@@ -513,7 +513,7 @@ ComposerClient::~ComposerClient() {
     hwc_->DeinitDisplays();
     hwc_.reset();
   }
-  LOG(DEBUG) << "removed composer client";
+  ALOGD("removed composer client");
 }
 
 ndk::ScopedAStatus ComposerClient::createLayer(int64_t display_handle,
@@ -1566,7 +1566,7 @@ ndk::ScopedAStatus ComposerClient::startHdcpNegotiation(
   if (levels.connectedLevel != drm::HdcpLevel::HDCP_NONE &&
       levels.connectedLevel != drm::HdcpLevel::HDCP_UNKNOWN) {
     ALOGI("Requested to start HDCP for connected level : %d",
-          levels.connectedLevel);
+          static_cast<int>(levels.connectedLevel));
     if (!display->StartHdcp(true)) {
       return ToBinderStatus(hwc3::Error::kUnsupported);
     }
diff --git a/hwc3/Utils.h b/hwc3/Utils.h
index fb90ad4..b3c0271 100644
--- a/hwc3/Utils.h
+++ b/hwc3/Utils.h
@@ -17,10 +17,11 @@
 #pragma once
 
 #include <aidl/android/hardware/graphics/composer3/IComposerClient.h>
-#include <log/log.h>
 
 #include <cstdint>
 
+#include "utils/log.h"
+
 // NOLINTNEXTLINE
 #define DEBUG_FUNC() ALOGV("%s", __func__)