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

Commit 55113971 authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge "TIF: fix NPE in the case a hardware TV input is not ready to use."

parents 7b74a5cd 731843e4

media/java/android/media/tv/TvInputService.java

+2 −1
Original line number Diff line number Diff line
@@ -1223,6 +1223,8 @@ public abstract class TvInputService extends Service { 
                    args.arg2 = mProxySession;

                    args.arg3 = mProxySessionCallback;

                    args.arg4 = session.getToken();

                    session.tune(TvContract.buildChannelUriForPassthroughInput(

                            getHardwareInputId()));

                } else {

                    args.arg1 = null;

                    args.arg2 = null;
@@ -1232,7 +1234,6 @@ public abstract class TvInputService extends Service { 
                }

                mServiceHandler.obtainMessage(ServiceHandler.DO_NOTIFY_SESSION_CREATED, args)

                        .sendToTarget();

                session.tune(TvContract.buildChannelUriForPassthroughInput(getHardwareInputId()));

            }



            @Override