diff options
| author | Jae Seo <jaeseo@google.com> | 2014-05-15 21:34:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-15 21:34:31 +0000 |
| commit | ad78f35f114131901066d101841082dc1e5a9f86 (patch) | |
| tree | b549cd803a2fefba5d13e2d0136571fac6b7beb2 /src/com/android/tv | |
| parent | 3eb4cf02f5bca3f6172996263d42e758e8f04cc1 (diff) | |
| parent | 38fc1d687531a89b5bcb58b268e654feb8faa9ba (diff) | |
| download | TV-ad78f35f114131901066d101841082dc1e5a9f86.tar.gz | |
Merge "Revert "Implement onSessionReleased for TV app.""
Diffstat (limited to 'src/com/android/tv')
| -rw-r--r-- | src/com/android/tv/TvActivity.java | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/com/android/tv/TvActivity.java b/src/com/android/tv/TvActivity.java index 8a2e1425..ce0ef50e 100644 --- a/src/com/android/tv/TvActivity.java +++ b/src/com/android/tv/TvActivity.java @@ -585,8 +585,12 @@ public class TvActivity extends Activity implements public void onSessionCreated(TvInputManager.Session session) { if (session != null) { mTvSession = session; - mAudioManager.requestAudioFocus(TvActivity.this, + int result = 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(); } @@ -595,15 +599,6 @@ 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() { @@ -645,14 +640,6 @@ 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()) { @@ -791,6 +778,7 @@ 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; } |