Merge "CanvasContext::draw: flushAndSubmit when not drawing" into sc-dev

libs/hwui/renderthread/CanvasContext.cpp

@@ -482,6 +482,12 @@ nsecs_t CanvasContext::draw() {
 
     if (dirty.isEmpty() && Properties::skipEmptyFrames && !surfaceRequiresRedraw()) {
         mCurrentFrameInfo->addFlag(FrameInfoFlags::SkippedFrame);
+        if (auto grContext = getGrContext()) {
+            // Submit to ensure that any texture uploads complete and Skia can
+            // free its staging buffers.
+            grContext->flushAndSubmit();
+        }
+
         // Notify the callbacks, even if there's nothing to draw so they aren't waiting
         // indefinitely
         waitOnFences();