diff options
| author | Youngsang Cho <youngsang@google.com> | 2014-05-20 11:35:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-20 11:35:01 +0000 |
| commit | 9419bd5aa79ca40126b949a90c3a4c999361f72d (patch) | |
| tree | 5b9f39fb6390a9c65ff7c7139897aef44dd30e51 /src/com/android/tv | |
| parent | b2ed7dfece23f8264839ffc79696f43edaf024b7 (diff) | |
| parent | 348a647d40360a8e56408d616b117736373db2c7 (diff) | |
| download | TV-9419bd5aa79ca40126b949a90c3a4c999361f72d.tar.gz | |
Merge "Fix a bug for PIP"
Diffstat (limited to 'src/com/android/tv')
| -rw-r--r-- | src/com/android/tv/TvActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/tv/TvActivity.java b/src/com/android/tv/TvActivity.java index 44de58da..f8e27b39 100644 --- a/src/com/android/tv/TvActivity.java +++ b/src/com/android/tv/TvActivity.java @@ -541,13 +541,13 @@ public class TvActivity extends Activity implements } private void startPip() { - if (!mTvView.isPlaying()) { + if (!mTvView.isPlaying() || mTvView.getCurrentChannelId() == Channel.INVALID_ID) { Log.w(TAG, "TV content should be playing"); return; } if (DEBUG) Log.d(TAG, "startPip()"); mPipView.start(mTvInputManagerHelper); - boolean success = mPipView.tuneTo(mChannelMap.getCurrentChannelId(), new OnTuneListener() { + boolean success = mPipView.tuneTo(mTvView.getCurrentChannelId(), new OnTuneListener() { @Override public void onUnexpectedStop(long channelId) { Log.w(TAG, "The PIP is Unexpectedly stopped"); |