From 0c207340b9aaf005da21b15c984e73eec8efacde Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Fri, 14 Apr 2017 19:47:23 -0700 Subject: [PATCH] Fix for SurfaceView out of a view hierarchy At most of the time, developers rely on GLSurfaceView to manage the OpenGL lifecycle. This means that a SurfaceView might not always have a ViewRootImpl. Test: select timelapse wallpaper and set it. Bug: 37363390 Change-Id: I3cdb1ec2a6e91cfad65fd823a7436f0010c0859c --- core/java/android/view/SurfaceView.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 1a71679449a44..9d40895f6ad95 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -295,7 +295,15 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb @Override protected void onDetachedFromWindow() { - getViewRootImpl().removeWindowStoppedCallback(this); + ViewRootImpl viewRoot = getViewRootImpl(); + // It's possible to create a SurfaceView using the default constructor and never + // attach it to a view hierarchy, this is a common use case when dealing with + // OpenGL. A developer will probably create a new GLSurfaceView, and let it manage + // the lifecycle. Instead of attaching it to a view, he/she can just pass + // the SurfaceHolder forward, most live wallpapers do it. + if (viewRoot != null) { + viewRoot.removeWindowStoppedCallback(this); + } mAttachedToWindow = false; if (mGlobalListenersAdded) {