diff options
| author | Andreas Huber <andih@google.com> | 2010-10-29 12:00:20 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-10-29 13:20:06 -0700 |
| commit | 05ea6434ed399395e2dbe9f68abb44f04b274cb0 (patch) | |
| tree | 96fc95609b002fdf18ae1dff241d3c3a549f1673 /media/libmediaplayerservice/StagefrightPlayer.h | |
| parent | c8ca26ed63edcf2731c4773b8ce3141930cc7245 (diff) | |
| download | frameworks_av-05ea6434ed399395e2dbe9f68abb44f04b274cb0.zip frameworks_av-05ea6434ed399395e2dbe9f68abb44f04b274cb0.tar.gz frameworks_av-05ea6434ed399395e2dbe9f68abb44f04b274cb0.tar.bz2 | |
Squashed commit of the following:
commit 0d5694ba2d399dd0869532a4d6256448185a1be0
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:59:23 2010 -0700
suspend() and resume() methods on VideoView are back but don't do anything.
They need to be back because they were public before.
Change-Id: Iddfd1021ffcf341f26e8d55ba761fd33701e2425
commit 16192891ed7d349ee97e47d1729d20a2d0d247b8
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:47:05 2010 -0700
Revert "New API on VideoView widget to suspend/resume a session. Do not release the MediaPlayer client for video suspending/resuming."
This reverts commit 2e1818a4d16c3309660f27286c77d8d1eee95a25.
Conflicts:
api/current.xml
Change-Id: I68dd1d05871044faf3f832d0838aa40bc7f890e5
commit 8f934dc1a3ae4e60f0790fcf97671e063fa20fad
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:44:16 2010 -0700
Revert "Release mediaplayer if the current state is not suspending. Fix for bug 2480093."
This reverts commit efb882cf75eef39ecaf9f8920ed302a019fa629f.
commit f2ed03550887986f39d36b5dabcd9e919949c7cf
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:44:08 2010 -0700
Revert "Release MediaPlayer if suspend() returns false."
This reverts commit 047212fd4ea360675e94d3ce83c7f5544f65b268.
commit 441ecce678bd24e9660a72c8627b5bd94433ff8b
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:40:46 2010 -0700
manually.
Change-Id: I4fdd43c9f7c8b3eedddb31a196da4984e1c58e87
Change-Id: I60d4b10e7a9e4ed8d9a796f1711618f557eb6e89
Diffstat (limited to 'media/libmediaplayerservice/StagefrightPlayer.h')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightPlayer.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/StagefrightPlayer.h b/media/libmediaplayerservice/StagefrightPlayer.h index dd37102..3899447 100644 --- a/media/libmediaplayerservice/StagefrightPlayer.h +++ b/media/libmediaplayerservice/StagefrightPlayer.h @@ -51,8 +51,6 @@ public: virtual player_type playerType(); virtual status_t invoke(const Parcel &request, Parcel *reply); virtual void setAudioSink(const sp<AudioSink> &audioSink); - virtual status_t suspend(); - virtual status_t resume(); virtual status_t getMetadata( const media::Metadata::Filter& ids, Parcel *records); |