Merge changes from topic "make-displayid-opaque" into main

* changes:
  SF: Remove PhysicalDisplayId::getPort()
  SF: Remove *DisplayId::tryCast and DisplayId::isVirtual()
  SF: Remove *DisplayId::tryCast usage from ScreenCaptureOutput
  SF: Remove *DisplayId::tryCast usage from VirtualDisplaySurface
  SF: Remove *DisplayId::tryCast usage from Output

1 files changed, 1 insertions, 1 deletions

diff --git a/services/surfaceflinger/RegionSamplingThread.cpp b/services/surfaceflinger/RegionSamplingThread.cpp
index 514adac20c..615492a872 100644
--- a/services/surfaceflinger/RegionSamplingThread.cpp
+++ b/services/surfaceflinger/RegionSamplingThread.cpp
@@ -348,7 +348,7 @@ void RegionSamplingThread::captureSample() {
 
     SurfaceFlinger::ScreenshotArgs screenshotArgs;
     screenshotArgs.captureTypeVariant = displayWeak;
-    screenshotArgs.displayId = std::nullopt;
+    screenshotArgs.displayIdVariant = std::nullopt;
     screenshotArgs.sourceCrop = sampledBounds.isEmpty() ? layerStackSpaceRect : sampledBounds;
     screenshotArgs.reqSize = sampledBounds.getSize();
     screenshotArgs.dataspace = ui::Dataspace::V0_SRGB;