diff options
| author | Andreas Huber <andih@google.com> | 2012-09-20 16:00:17 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-09-21 09:24:08 -0700 |
| commit | 207e18540fefbaf530a4fdf506d266f34ddec84f (patch) | |
| tree | d8e7d7db4c874aabfe35c5fdd4a5dcf7bf72047d /media/libmediaplayerservice | |
| parent | 086f958a7e539acffb637b42f5a6998184544179 (diff) | |
| download | frameworks_av-207e18540fefbaf530a4fdf506d266f34ddec84f.zip frameworks_av-207e18540fefbaf530a4fdf506d266f34ddec84f.tar.gz frameworks_av-207e18540fefbaf530a4fdf506d266f34ddec84f.tar.bz2 | |
Remove legacy code and APIs in wifi display related code.
Change-Id: Ia010e7a00534f9356b3247369d0ffd65591d91aa
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 25 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 4 |
2 files changed, 0 insertions, 29 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index eaa44e2..9bedff1 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -295,31 +295,6 @@ sp<IRemoteDisplay> MediaPlayerService::listenForRemoteDisplay( return new RemoteDisplay(client, iface.string()); } -// TODO: delete this method -status_t MediaPlayerService::enableRemoteDisplay(const char *iface) { - if (!checkPermission("android.permission.CONTROL_WIFI_DISPLAY")) { - return PERMISSION_DENIED; - } - - Mutex::Autolock autoLock(mLock); - - if (iface != NULL) { - if (mRemoteDisplay != NULL) { - return INVALID_OPERATION; - } - - mRemoteDisplay = new RemoteDisplay(NULL /* client */, iface); - return OK; - } - - if (mRemoteDisplay != NULL) { - mRemoteDisplay->dispose(); - mRemoteDisplay.clear(); - } - - return OK; -} - status_t MediaPlayerService::AudioCache::dump(int fd, const Vector<String16>& args) const { const size_t SIZE = 256; diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index 6105ce4..fd648df 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -44,7 +44,6 @@ class IOMX; class IRemoteDisplay; class IRemoteDisplayClient; class MediaRecorderClient; -struct RemoteDisplay; #define CALLBACK_ANTAGONIZER 0 #if CALLBACK_ANTAGONIZER @@ -254,8 +253,6 @@ public: virtual sp<IRemoteDisplay> listenForRemoteDisplay(const sp<IRemoteDisplayClient>& client, const String8& iface); - virtual status_t enableRemoteDisplay(const char *iface); - virtual status_t dump(int fd, const Vector<String16>& args); void removeClient(wp<Client> client); @@ -431,7 +428,6 @@ private: int32_t mNextConnId; sp<IOMX> mOMX; sp<ICrypto> mCrypto; - sp<RemoteDisplay> mRemoteDisplay; }; // ---------------------------------------------------------------------------- |