Merge "Revert "libhwc2.1: support setIdleTimerEnabled""

4 files changed, 3 insertions, 22 deletions

diff --git a/hwc3/ComposerClient.cpp b/hwc3/ComposerClient.cpp
index 49d0e80..848d1f7 100644
--- a/hwc3/ComposerClient.cpp
+++ b/hwc3/ComposerClient.cpp
@@ -162,16 +162,6 @@ ndk::ScopedAStatus ComposerClient::getDisplayCapabilities(int64_t display,
         return TO_BINDER_STATUS(err);
     }
 
-    bool support = false;
-    err = mHal->getDisplayIdleTimerSupport(display, support);
-    if (err != ::android::OK) {
-        LOG(ERROR) << "failed to getDisplayIdleTimerSupport: " << err;
-    }
-
-    if (support) {
-        caps->push_back(DisplayCapability::DISPLAY_IDLE_TIMER);
-    }
-
     return TO_BINDER_STATUS(err);
 }
 
diff --git a/hwc3/impl/HalImpl.cpp b/hwc3/impl/HalImpl.cpp
index 4d50225..240edff 100644
--- a/hwc3/impl/HalImpl.cpp
+++ b/hwc3/impl/HalImpl.cpp
@@ -939,11 +939,12 @@ int32_t HalImpl::setVsyncEnabled(int64_t display, bool enabled) {
     return halDisplay->setVsyncEnabled(hwcEnable);
 }
 
-int32_t HalImpl::setIdleTimerEnabled(int64_t display, int32_t timeout) {
+int32_t HalImpl::setIdleTimerEnabled(int64_t display, int32_t __unused timeout) {
     ExynosDisplay* halDisplay;
     RET_IF_ERR(getHalDisplay(display, halDisplay));
 
-    return halDisplay->setDisplayIdleTimer(timeout);
+    // TODO(b/198808492): implement setIdleTimerEnabled
+    return HWC2_ERROR_UNSUPPORTED;
 }
 
 int32_t HalImpl::validateDisplay(int64_t display, std::vector<int64_t>* outChangedLayers,
@@ -1013,11 +1014,4 @@ int32_t HalImpl::getRCDLayerSupport(int64_t display, bool& outSupport) {
     return halDisplay->getRCDLayerSupport(outSupport);
 }
 
-int32_t HalImpl::getDisplayIdleTimerSupport(int64_t display, bool& outSupport) {
-    ExynosDisplay* halDisplay;
-    RET_IF_ERR(getHalDisplay(display, halDisplay));
-
-    return halDisplay->getDisplayIdleTimerSupport(outSupport);
-}
-
 } // namespace aidl::android::hardware::graphics::composer3::impl
diff --git a/hwc3/impl/HalImpl.h b/hwc3/impl/HalImpl.h
index d60d7d0..2c6d540 100644
--- a/hwc3/impl/HalImpl.h
+++ b/hwc3/impl/HalImpl.h
@@ -135,7 +135,6 @@ class HalImpl : public IComposerHal {
     int32_t setReadbackBuffer(int64_t display, buffer_handle_t buffer,
                               const ndk::ScopedFileDescriptor& releaseFence) override;
     int32_t setVsyncEnabled(int64_t display, bool enabled) override;
-    int32_t getDisplayIdleTimerSupport(int64_t display, bool& outSupport) override;
     int32_t setIdleTimerEnabled(int64_t display, int32_t timeout) override;
     int32_t getRCDLayerSupport(int64_t display, bool& outSupport) override;
     int32_t validateDisplay(int64_t display, std::vector<int64_t>* outChangedLayers,
diff --git a/hwc3/include/IComposerHal.h b/hwc3/include/IComposerHal.h
index 00bfdee..693c2b1 100644
--- a/hwc3/include/IComposerHal.h
+++ b/hwc3/include/IComposerHal.h
@@ -119,8 +119,6 @@ class IComposerHal {
     virtual int32_t getDisplayAttribute(int64_t display, int32_t config,
                                       DisplayAttribute attribute, int32_t* outValue) = 0;
     virtual int32_t getDisplayBrightnessSupport(int64_t display, bool& outSupport) = 0;
-    virtual int32_t getDisplayIdleTimerSupport(int64_t display, bool& outSupport) = 0;
-
     virtual int32_t getDisplayCapabilities(int64_t display,
                                            std::vector<DisplayCapability>* caps) = 0;
     virtual int32_t getDisplayConfigs(int64_t display, std::vector<int32_t>* configs) = 0;