commit 848f651554704ca506b8f72e90f5a99b19abc09f
author John Reck <jreck@google.com> Mon Dec 03 13:26:43 2018 -0800
committer John Reck <jreck@google.com> Thu Dec 06 15:18:27 2018 -0800
tree 7f9defac502cc8593754c0483fe17c309f5bf262
parent f660c012b080496eb70ea77f141f346e80bb6cfa

Revert "Revert "Make HWUI's surface Reliable^TM""

This reverts commit dd08224e4d75689c42bf452d44617f84072649a1.

Bug: 120097554
Bug: 120342364
Bug: 120421537

Test: verified emulator can boot OK, with no log warnings
Test: verified keyboard works in landscape

Change-Id: Iae2cd1140d81755b126adfb21ec885181f3bc6b6

libs/hwui/renderthread/CanvasContext.h

diff --git a/libs/hwui/renderthread/CanvasContext.h b/libs/hwui/renderthread/CanvasContext.h
index 70be4a6..9e7abf4 100644
--- a/libs/hwui/renderthread/CanvasContext.h
+++ b/libs/hwui/renderthread/CanvasContext.h
@@ -25,6 +25,7 @@
 #include "IRenderPipeline.h"
 #include "LayerUpdateQueue.h"
 #include "RenderNode.h"
+#include "ReliableSurface.h"
 #include "renderthread/RenderTask.h"
 #include "renderthread/RenderThread.h"
 #include "thread/Task.h"
@@ -219,7 +220,7 @@
     EGLint mLastFrameHeight = 0;
 
     RenderThread& mRenderThread;
-    sp<Surface> mNativeSurface;
+    sp<ReliableSurface> mNativeSurface;
     // stopped indicates the CanvasContext will reject actual redraw operations,
     // and defer repaint until it is un-stopped
     bool mStopped = false;