Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6a97905 authored by Youngsang Cho's avatar Youngsang Cho Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in TvInputService and TvView"

parents 228d4654 c31c450f

core/java/android/tv/TvInputService.java

+1 −1
Original line number Diff line number Diff line
@@ -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

+3 −1
Original line number Diff line number Diff line
@@ -347,7 +347,9 @@ public class TvView extends SurfaceView { 
        public void onSessionCreated(Session session) {

            if (this != mSessionCallback) {

                // This callback is obsolete.

                if (session != null) {

                    session.release();

                }

                return;

            }

            mSession = session;