commit bd0827aa2fba602e91858dfb4736a00848dd9de9
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 07 01:01:30 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 07 01:01:30 2020 +0000
tree 394a419809b66c13e96ca6c091db0954d589c97d
parent 79f84e98be5aff150d3b2737b5dac91bf0969de0
parent 2391e8c16eb30184ff025c8f9304d5858f0c1fc8

Merge "composer: register only vsync_2_4 callback"

graphics/composer/2.4/utils/passthrough/include/composer-passthrough/2.4/HwcHal.h

diff --git a/graphics/composer/2.4/utils/passthrough/include/composer-passthrough/2.4/HwcHal.h b/graphics/composer/2.4/utils/passthrough/include/composer-passthrough/2.4/HwcHal.h
index a27582a..a34572d 100644
--- a/graphics/composer/2.4/utils/passthrough/include/composer-passthrough/2.4/HwcHal.h
+++ b/graphics/composer/2.4/utils/passthrough/include/composer-passthrough/2.4/HwcHal.h
@@ -59,9 +59,6 @@
                 mDevice, HWC2_CALLBACK_REFRESH, this,
                 reinterpret_cast<hwc2_function_pointer_t>(refreshHook));
         BaseType2_1::mDispatch.registerCallback(
-                mDevice, HWC2_CALLBACK_VSYNC, this,
-                reinterpret_cast<hwc2_function_pointer_t>(vsyncHook));
-        BaseType2_1::mDispatch.registerCallback(
                 mDevice, HWC2_CALLBACK_VSYNC_2_4, this,
                 reinterpret_cast<hwc2_function_pointer_t>(vsync_2_4_Hook));
 
@@ -80,7 +77,6 @@
         // which is likely incorrect
         BaseType2_1::mDispatch.registerCallback(mDevice, HWC2_CALLBACK_HOTPLUG, this, nullptr);
         BaseType2_1::mDispatch.registerCallback(mDevice, HWC2_CALLBACK_REFRESH, this, nullptr);
-        BaseType2_1::mDispatch.registerCallback(mDevice, HWC2_CALLBACK_VSYNC, this, nullptr);
         BaseType2_1::mDispatch.registerCallback(mDevice, HWC2_CALLBACK_VSYNC_2_4, this, nullptr);
         BaseType2_1::mDispatch.registerCallback(mDevice, HWC2_CALLBACK_VSYNC_PERIOD_TIMING_CHANGED,
                                                 this, nullptr);