commit 05386c5c4b65ab9a13557c12fc1be64205a47cf5
author Doug Horn <doughorn@google.com> Fri Jan 08 13:51:36 2021 -0800
committer Doug Horn <doughorn@google.com> Mon Jan 11 14:03:48 2021 -0800
tree ff8040b5ce5a5bb77cde7ee7457b2e6144c5fa16
parent a359e03827fa464cee61d9674dffa14e80045b99

asg: add snapshot support

Manual cherry-pick of aosp/1531939

Change-Id: Ia10e8dc224497489260e53fd785bd40f4e2f6060

stream-servers/RenderThread.cpp

diff --git a/stream-servers/RenderThread.cpp b/stream-servers/RenderThread.cpp
index 5d223ca..a6e85d9 100644
--- a/stream-servers/RenderThread.cpp
+++ b/stream-servers/RenderThread.cpp
@@ -114,8 +114,8 @@
 
 RenderThread::RenderThread(
         struct asg_context context,
-        android::emulation::asg::ConsumerCallbacks callbacks,
-        android::base::Stream* loadStream)
+        android::base::Stream* loadStream,
+        android::emulation::asg::ConsumerCallbacks callbacks)
     : android::base::Thread(android::base::ThreadFlags::MaskSignals, 2 * 1024 * 1024),
       mRingStream(
           new RingStream(context, callbacks, kStreamBufferSize)) {
@@ -370,6 +370,10 @@
                     break;
                 }
             } else if (needRestoreFromSnapshot) {
+                // If we're using RingStream that might load before FrameBuffer
+                // restores the contexts from the handles, so check again here.
+
+                tInfo.postLoadRefreshCurrentContextSurfacePtrs();
                 // We just loaded from a snapshot, need to initialize / bind
                 // the contexts.
                 needRestoreFromSnapshot = false;