commit 6c564cfd68e373825e26a6c6dda8759dd12b2036
author Lloyd Pique <lpique@google.com> Fri May 17 17:31:36 2019 -0700
committer Lloyd Pique <lpique@google.com> Wed Sep 25 13:09:49 2019 -0700
tree 016cd9b445a86ee2905da303e517446eab719e56
parent 10502f5aa8e0b8f667062617a9e3c7ff3d5837f1

CE: Introduce Output::GetDisplayId()

Allow anyone with an Output interface pointer to get the displayId (if
any) associated with the output.

As the return value is optional, an output that does not have a
displayId can return std::nullopt

Test: atest libsurfaceflinger_unittest libcompositionengine_test
Test: go/wm-smoke
Bug: 121291683
Change-Id: Ie34da86aa4b55d11a291156e85dae678d7df5ee2

services/surfaceflinger/CompositionEngine/src/Display.cpp

diff --git a/services/surfaceflinger/CompositionEngine/src/Display.cpp b/services/surfaceflinger/CompositionEngine/src/Display.cpp
index 405ad42..e885629 100644
--- a/services/surfaceflinger/CompositionEngine/src/Display.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/Display.cpp
@@ -55,6 +55,10 @@
     return mIsVirtual;
 }
 
+std::optional<DisplayId> Display::getDisplayId() const {
+    return mId;
+}
+
 void Display::disconnect() {
     if (!mId) {
         return;

services/surfaceflinger/CompositionEngine/src/Output.cpp

diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp
index c3e5cfd..2007ea3 100644
--- a/services/surfaceflinger/CompositionEngine/src/Output.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp
@@ -75,6 +75,10 @@
             mRenderSurface->isValid();
 }
 
+std::optional<DisplayId> Output::getDisplayId() const {
+    return {};
+}
+
 const std::string& Output::getName() const {
     return mName;
 }