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

Commit c31c450f authored by Youngsang Cho's avatar Youngsang Cho
Browse files

Fix NPE in TvInputService and TvView 

Bug: 14781233, Bug: 14629185
Change-Id: I8511674f4f3864b3deaa58f4c95b9c91e68f49f4
parent 59618a18

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;