Fix a bug for PIP

Change-Id: I646e25dc822568799dd0cadb4f827ec3d3242f70

1 files changed, 2 insertions, 2 deletions

diff --git a/src/com/android/tv/TvActivity.java b/src/com/android/tv/TvActivity.java
index cbe3827a..a1a6bd4c 100644
--- a/src/com/android/tv/TvActivity.java
+++ b/src/com/android/tv/TvActivity.java
@@ -532,13 +532,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");