diff options
| author | Dongwon Kang <dwkang@google.com> | 2015-03-23 23:18:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-23 23:18:29 +0000 |
| commit | 55113971e28ee2f1b331185884d67e1921ae7715 (patch) | |
| tree | 70d41d3d93b0bed3378bdac986b768c407cce512 /media | |
| parent | 7b74a5cd7e147155af8213c85d58f913c220be35 (diff) | |
| parent | 731843e424a0d7091eb42d579aab6a66a74b92ca (diff) | |
| download | frameworks_base-55113971e28ee2f1b331185884d67e1921ae7715.zip frameworks_base-55113971e28ee2f1b331185884d67e1921ae7715.tar.gz frameworks_base-55113971e28ee2f1b331185884d67e1921ae7715.tar.bz2 | |
Merge "TIF: fix NPE in the case a hardware TV input is not ready to use."
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/tv/TvInputService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java index cf1b441..b887855 100644 --- a/media/java/android/media/tv/TvInputService.java +++ b/media/java/android/media/tv/TvInputService.java @@ -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 |