summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/SurfaceFlinger.h
diff options
context:
space:
mode:
author Vishnu Nair <vishnun@google.com> 2023-05-11 16:32:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-11 16:32:22 +0000
commiteb2e8ceca9ca8b0fd280e854511294f87d586c28 (patch)
treeb229c1590424024b17b9f25e99ae8ce2b49ad8f7 /services/surfaceflinger/SurfaceFlinger.h
parent8a716ebf533de4e83ec4c01c9b622de90d335e0b (diff)
parent12cda385cfc6650da2b65455e4ce75fea5fe5871 (diff)
Merge "[sf] Properly update clones of clones" into udc-dev am: 12cda385cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23137686 Change-Id: I2a800c8970e9bfda3b3b99c8b5250444f6d31cbd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.h')
-rw-r--r--services/surfaceflinger/SurfaceFlinger.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index d92ec7a3b6..cfaa221a45 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -296,8 +296,7 @@ public:
// the client can no longer modify this layer directly.
void onHandleDestroyed(BBinder* handle, sp<Layer>& layer, uint32_t layerId);
- // TODO: Remove atomic if move dtor to main thread CL lands
- std::atomic<uint32_t> mNumClones;
+ std::vector<Layer*> mLayerMirrorRoots;
TransactionCallbackInvoker& getTransactionCallbackInvoker() {
return mTransactionCallbackInvoker;