From 6ba466ff3e8565ca412c1e36dcb31a617fc42f6a Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Fri, 30 Sep 2016 14:30:04 -0700
Subject: [PATCH] SurfaceView only call forceDisconnect if isValid

Change-Id: I683c2f937f44d8b3d912839a3e91cbd5b5c7f437
Fixes: 31778946
Test: Manual, launch Cookie Jam then tap recents
---
 core/java/android/view/SurfaceView.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index 754cdd8fc02f3..4b9a5708173f4 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -598,7 +598,9 @@ public class SurfaceView extends View {
                             // surfaceDestroyed and surfaceCreated, we force a disconnect,
                             // so the next connect will always work if we end up reusing
                             // the surface.
-                            mSurface.forceScopedDisconnect();
+                            if (mSurface.isValid()) {
+                                mSurface.forceScopedDisconnect();
+                            }
                         }
                     }