diff options
| author | RoboErik <epastern@google.com> | 2014-09-02 07:10:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-02 07:10:57 +0000 |
| commit | 5bd23653e06b872d9e1fda4fa6df4a4b2980d46c (patch) | |
| tree | 11a223412818ca1b5245459f5f9b783174fb65fe /media | |
| parent | 9ab7f2618386d39522dfda9dbecac1d82e1201ad (diff) | |
| parent | 3bf1f1d042fb1e3260b1292d8608cb19e02427bd (diff) | |
| download | frameworks_base-5bd23653e06b872d9e1fda4fa6df4a4b2980d46c.zip frameworks_base-5bd23653e06b872d9e1fda4fa6df4a4b2980d46c.tar.gz frameworks_base-5bd23653e06b872d9e1fda4fa6df4a4b2980d46c.tar.bz2 | |
am 85a4839e: am e9fbaa4e: am 169739a7: Merge "Document MediaSession.Callback.onMediaButtonEvent and add returns" into lmp-dev
* commit '85a4839e995fcf0aabce973c18d984badd9509d2':
Document MediaSession.Callback.onMediaButtonEvent and add returns
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/session/MediaSession.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java index 8d2c62f..0c7c097 100644 --- a/media/java/android/media/session/MediaSession.java +++ b/media/java/android/media/session/MediaSession.java @@ -701,6 +701,7 @@ public final class MediaSession { * * @param mediaButtonIntent an intent containing the KeyEvent as an * extra + * @return True if the event was handled, false otherwise. */ public boolean onMediaButtonEvent(@NonNull Intent mediaButtonIntent) { if (mSession != null @@ -713,36 +714,43 @@ public final class MediaSession { case KeyEvent.KEYCODE_MEDIA_PLAY: if ((validActions & PlaybackState.ACTION_PLAY) != 0) { onPlay(); + return true; } break; case KeyEvent.KEYCODE_MEDIA_PAUSE: if ((validActions & PlaybackState.ACTION_PAUSE) != 0) { onPause(); + return true; } break; case KeyEvent.KEYCODE_MEDIA_NEXT: if ((validActions & PlaybackState.ACTION_SKIP_TO_NEXT) != 0) { onSkipToNext(); + return true; } break; case KeyEvent.KEYCODE_MEDIA_PREVIOUS: if ((validActions & PlaybackState.ACTION_SKIP_TO_PREVIOUS) != 0) { onSkipToPrevious(); + return true; } break; case KeyEvent.KEYCODE_MEDIA_STOP: if ((validActions & PlaybackState.ACTION_STOP) != 0) { onStop(); + return true; } break; case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: if ((validActions & PlaybackState.ACTION_FAST_FORWARD) != 0) { onFastForward(); + return true; } break; case KeyEvent.KEYCODE_MEDIA_REWIND: if ((validActions & PlaybackState.ACTION_REWIND) != 0) { onRewind(); + return true; } break; case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE: @@ -755,8 +763,10 @@ public final class MediaSession { | PlaybackState.ACTION_PAUSE)) != 0; if (isPlaying && canPause) { onPause(); + return true; } else if (!isPlaying && canPlay) { onPlay(); + return true; } break; } |