commit e6bb5cbc7c9a34304836fc423c8e1c8ccd8c400c
author Galia Peycheva <galinap@google.com> Mon Aug 02 13:26:27 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 02 13:26:27 2021 +0000
tree 2357a0901a10a4258ebb9e1bd017995e1d61eabb
parent 0a878cabbe8464c89fdb5654b6afd90ce1c661ff
parent 3686bac8c3d3cde73542f5faf4241f332430b773

Merge "Fix Colors crashing on rotation"

src/com/android/dreams/basic/Colors.java

diff --git a/src/com/android/dreams/basic/Colors.java b/src/com/android/dreams/basic/Colors.java
index d30c174..5bff87b 100644
--- a/src/com/android/dreams/basic/Colors.java
+++ b/src/com/android/dreams/basic/Colors.java
@@ -53,14 +53,6 @@
 
         setInteractive(false);
 
-        mSurfaceView = new SurfaceView(this);
-        mSurfaceView.getHolder().addCallback(this);
-
-        if (mRendererHandlerThread == null) {
-            mRendererHandlerThread = new HandlerThread(TAG);
-            mRendererHandlerThread.start();
-            mRendererHandler = new Handler(mRendererHandlerThread.getLooper());
-        }
     }
 
     @Override
@@ -68,6 +60,10 @@
         super.onAttachedToWindow();
         setInteractive(false);
         setFullscreen(true);
+
+        mSurfaceView = new SurfaceView(this);
+        mSurfaceView.getHolder().addCallback(this);
+
         setContentView(mSurfaceView);
     }
 
@@ -76,6 +72,10 @@
         LOG("surfaceCreated(%s, %d, %d)", holder.getSurface(),
                 holder.getSurfaceFrame().width(), holder.getSurfaceFrame().height());
 
+        mRendererHandlerThread = new HandlerThread(TAG);
+        mRendererHandlerThread.start();
+        mRendererHandler = new Handler(mRendererHandlerThread.getLooper());
+
         mRendererHandler.post(new Runnable() {
             @Override
             public void run() {