| commit | 5be0865b7bf1b21b3888c77339060f7dc7dd8018 | [log] [tgz] |
|---|---|---|
| author | Alan Ding <alanding@google.com> | Fri May 24 01:48:07 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 24 01:48:07 2024 +0000 |
| tree | 1af345fd28cf488b30c8f8aa3725afec139cef42 | |
| parent | 78c90af2224b43467d854e356492527db0f8eb70 [diff] [blame] |
Revert "ui: Refactor stable ID generation for GPU virtual displays" This reverts commit 78c90af2224b43467d854e356492527db0f8eb70. Reason for revert: Causes assert for certain GPU virtual display Ids in VirtualDisplaySurface.cpp (https://paste.googleplex.com/6474098414977024) Change-Id: I743312bbab4fd9903e069c3ed4710f9d7901be8d
diff --git a/services/surfaceflinger/CompositionEngine/src/Display.cpp b/services/surfaceflinger/CompositionEngine/src/Display.cpp index 83b1b68..c18be7a 100644 --- a/services/surfaceflinger/CompositionEngine/src/Display.cpp +++ b/services/surfaceflinger/CompositionEngine/src/Display.cpp
@@ -79,7 +79,7 @@ } bool Display::isVirtual() const { - return mId.isVirtual(); + return VirtualDisplayId::tryCast(mId).has_value(); } std::optional<DisplayId> Display::getDisplayId() const {