commit 3a67f365bac7677901b7e15c2fbef58482e86c80
author Siarhei Vishniakou <svv@google.com> Mon Oct 05 23:01:31 2020 +0000
committer Siarhei Vishniakou <svv@google.com> Mon Oct 05 23:01:31 2020 +0000
tree 60db46cd055b1784b77310b7466fbe0c5ade840b
parent 7cee53e6eba7d376b5f0abdf71bc40d35fb7bad8

Revert "[SF] Introduce VirtualDisplayId"

Revert "CE-ARC: Track changes to DisplayId conversions"

Revert submission 12319471-virtual-display-id

Reason for revert: Breaks build on crosshatch-userdebug
Reverted Changes:
I7d9a3062c:CE-ARC: Track changes to DisplayId conversions
I550b1f471:[SF] Introduce VirtualDisplayId

Change-Id: Ife6b6b51babdc0566801f1c7d2db6239f6f926bd

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
index 14b54cd..4c3b3e5 100644
--- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
+++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
@@ -56,7 +56,7 @@
  *
  */
 
-FramebufferSurface::FramebufferSurface(HWComposer& hwc, PhysicalDisplayId displayId,
+FramebufferSurface::FramebufferSurface(HWComposer& hwc, DisplayId displayId,
                                        const sp<IGraphicBufferConsumer>& consumer,
                                        uint32_t maxWidth, uint32_t maxHeight)
       : ConsumerBase(consumer),