diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-10-28 02:14:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-28 02:14:01 +0000 |
| commit | 262620399c228b3b201c2c4b39c87508d3047d74 (patch) | |
| tree | 96e7fd612606424311873d34492def7da58bd6d8 /include | |
| parent | be1480bade58688d201335860247734aec6b11cb (diff) | |
| parent | 7dae00baa6e8957be15523c46bb948bd1dde64c3 (diff) | |
| download | frameworks_av-262620399c228b3b201c2c4b39c87508d3047d74.zip frameworks_av-262620399c228b3b201c2c4b39c87508d3047d74.tar.gz frameworks_av-262620399c228b3b201c2c4b39c87508d3047d74.tar.bz2 | |
am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
* commit '08479ceeba56c460fb52f60a24df27776f1936c3':
Stagefright: ANW::connect in MediaPlayerService
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/mediaplayer.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index e98d55c..08835fb 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -209,7 +209,6 @@ private: status_t prepareAsync_l(); status_t getDuration_l(int *msec); status_t attachNewPlayer(const sp<IMediaPlayer>& player); - void disconnectNativeWindow(); status_t reset_l(); sp<IMediaPlayer> mPlayer; @@ -233,8 +232,6 @@ private: int mVideoHeight; int mAudioSessionId; float mSendLevel; - sp<ANativeWindow> mConnectedWindow; - sp<IBinder> mConnectedWindowBinder; }; }; // namespace android |