Merge "Fix NPE in TvInputService and TvView"

core/java/android/tv/TvInputService.java

@@ -489,7 +489,7 @@ public abstract class TvInputService extends Service {
                     }
                 }
             }
-            if (mOverlayView == null) {
+            if (mOverlayView == null || !mOverlayView.isAttachedToWindow()) {
                 return Session.DISPATCH_NOT_HANDLED;
             }
             if (!mOverlayView.hasWindowFocus()) {

core/java/android/tv/TvView.java

@@ -347,7 +347,9 @@ public class TvView extends SurfaceView {
         public void onSessionCreated(Session session) {
             if (this != mSessionCallback) {
                 // This callback is obsolete.
-                session.release();
+                if (session != null) {
+                    session.release();
+                }
                 return;
             }
             mSession = session;