commit 3f8b28918dac53c2418bf72b139a97a854a6626d
author Prabir Pradhan <prabirmsp@google.com> Thu Nov 18 08:55:02 2021 -0800
committer Prabir Pradhan <prabirmsp@google.com> Thu Nov 18 09:56:13 2021 -0800
tree af4e2defa934314ac9052dcc95537f3b5b620e73
parent 38ddd45e3beb7d307a8b90e0b36062fbb9dc208d

SpriteController: Reparent SurfaceControls to null before disposing

Bug: 206650086
Test: manual: see repro insructions in the bug
Change-Id: Ib8e39780002ecb74ade64791bdb98b8b9c969bce

libs/input/SpriteController.h

diff --git a/libs/input/SpriteController.h b/libs/input/SpriteController.h
index 2a80d95..2e9cb96 100644
--- a/libs/input/SpriteController.h
+++ b/libs/input/SpriteController.h
@@ -251,8 +251,8 @@
     sp<SurfaceComposerClient> mSurfaceComposerClient;
 
     struct Locked {
-        Vector<sp<SpriteImpl> > invalidatedSprites;
-        Vector<sp<SurfaceControl> > disposedSurfaces;
+        std::vector<sp<SpriteImpl>> invalidatedSprites;
+        std::vector<sp<SurfaceControl>> disposedSurfaces;
         uint32_t transactionNestingCount;
         bool deferredSpriteUpdate;
     } mLocked; // guarded by mLock