Implement onSessionReleased for TV app.

Bug: 14980154
Change-Id: I4edf8a322fbb87e69e550f2a06c3bda5fc0f1041

1 files changed, 18 insertions, 6 deletions

diff --git a/src/com/android/tv/TvActivity.java b/src/com/android/tv/TvActivity.java
index 1f9b1972..9565b500 100644
--- a/src/com/android/tv/TvActivity.java
+++ b/src/com/android/tv/TvActivity.java
@@ -571,12 +571,8 @@ public class TvActivity extends Activity implements
                 public void onSessionCreated(TvInputManager.Session session) {
                     if (session != null) {
                         mTvSession = session;
-                        int result = mAudioManager.requestAudioFocus(TvActivity.this,
+                        mAudioManager.requestAudioFocus(TvActivity.this,
                                 AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
-                        mAudioFocusStatus =
-                                (result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) ?
-                                        AudioManager.AUDIOFOCUS_GAIN
-                                        : AudioManager.AUDIOFOCUS_LOSS;
                         if (mTunePendding) {
                             tune();
                         }
@@ -585,6 +581,15 @@ public class TvActivity extends Activity implements
                         // TODO: show something to user about this error.
                     }
                 }
+
+                @Override
+                public void onSessionReleased(TvInputManager.Session session) {
+                    Log.w(TAG, "Session is released by crash");
+                    if (mTvSession == session) {
+                        stopSession();
+                        startDefaultSession(Channel.INVALID_ID);
+                    }
+                }
             };
 
     private void startPipSession() {
@@ -626,6 +631,14 @@ public class TvActivity extends Activity implements
                         }
                     });
                 }
+
+                @Override
+                public void onSessionReleased(final TvInputManager.Session session) {
+                    Log.w(TAG, "PIP session is released by crash");
+                    if (mPipSession == session) {
+                        stopPipSession();
+                    }
+                }
             };
 
     private final ContentObserver mProgramUpdateObserver = new ContentObserver(new Handler()) {
@@ -764,7 +777,6 @@ public class TvActivity extends Activity implements
     private void stopSession() {
         if (mTvInputInfo != null) {
             if (mTvSession != null) {
-                mTvSession.setVolume(AUDIO_MIN_VOLUME);
                 mAudioManager.abandonAudioFocus(this);
                 mTvSession = null;
             }