commit 0c75f55f1fa1bcbf39c6b28feedb045f4c5a148e
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 27 15:28:30 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 27 15:28:30 2019 +0000
tree bd939d8d015a6cadf30ac49e13b901fe71e048b8
parent 14bd0ce8656e4089684252cd20868d5975bf2876
parent 2b0cd8de19458f8c753d403a2b27807be1f9f027

Merge "Make Transaction inherit Parcelable at public level"

libs/gui/include/gui/SurfaceComposerClient.h

diff --git a/libs/gui/include/gui/SurfaceComposerClient.h b/libs/gui/include/gui/SurfaceComposerClient.h
index f303a03..64ee65f 100644
--- a/libs/gui/include/gui/SurfaceComposerClient.h
+++ b/libs/gui/include/gui/SurfaceComposerClient.h
@@ -290,7 +290,7 @@
         std::unordered_set<sp<SurfaceControl>, SCHash> surfaceControls;
     };
 
-    class Transaction : Parcelable {
+    class Transaction : public Parcelable {
         std::unordered_map<sp<IBinder>, ComposerState, IBinderHash> mComposerStates;
         SortedVector<DisplayState > mDisplayStates;
         std::unordered_map<sp<ITransactionCompletedListener>, CallbackInfo, TCLHash>