commit 8722a310c00557195a0703e95564f31d908ab2d5
author Tomasz Wasilczyk <twasilczyk@google.com> Thu Apr 13 19:14:30 2017 +0000
committer Tomasz Wasilczyk <twasilczyk@google.com> Thu Apr 13 19:14:30 2017 +0000
tree 49482f95d4ce86b71d2800dcfa8867fdd6575702
parent 8d6c16dc3dc8b88a0046f53668a4e3be074507ff

Revert "Avoid a potential race condition on mDisplays"

This reverts commit 8d6c16dc3dc8b88a0046f53668a4e3be074507ff.

Bug: b/37282502
Change-Id: Ibf64607f9e14ede201510e2c1b502c49a31e9f2a

services/surfaceflinger/DisplayHardware/HWComposer_hwc1.h

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer_hwc1.h b/services/surfaceflinger/DisplayHardware/HWComposer_hwc1.h
index 4bc63bb..f64d69a 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer_hwc1.h
+++ b/services/surfaceflinger/DisplayHardware/HWComposer_hwc1.h
@@ -62,7 +62,7 @@
         friend class HWComposer;
         virtual void onVSyncReceived(
             HWComposer* composer, int32_t disp, nsecs_t timestamp) = 0;
-        virtual void onHotplugReceived(HWComposer* composer, int disp, bool connected) = 0;
+        virtual void onHotplugReceived(int disp, bool connected) = 0;
         virtual void onInvalidateReceived(HWComposer* composer) = 0;
     protected:
         virtual ~EventHandler() {}