diff options
| author | Dongwon Kang <dwkang@google.com> | 2015-03-23 17:13:55 +0900 |
|---|---|---|
| committer | Dongwon Kang <dwkang@google.com> | 2015-03-23 17:13:55 +0900 |
| commit | 731843e424a0d7091eb42d579aab6a66a74b92ca (patch) | |
| tree | 88acb4584db5e42c28df9fe4f8d3f85f79901964 /media/java | |
| parent | bf2673384cdea54eef2ca1c3e6ee35f5a3ce0e8a (diff) | |
| download | frameworks_base-731843e424a0d7091eb42d579aab6a66a74b92ca.zip frameworks_base-731843e424a0d7091eb42d579aab6a66a74b92ca.tar.gz frameworks_base-731843e424a0d7091eb42d579aab6a66a74b92ca.tar.bz2 | |
TIF: fix NPE in the case a hardware TV input is not ready to use.
Bug: 19805327
Change-Id: I0c96ab9274ea2404d75b02205ef40f56fb4552f6
Diffstat (limited to 'media/java')
| -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 |