From dcd810d01394cbcc78905b46e212a49e38f88b8b Mon Sep 17 00:00:00 2001 From: niko Date: Mon, 22 Jun 2009 08:49:52 -0700 Subject: [PATCH] Renamed all android.hardware.IMedia* strings to android.media.IMedia* The android.hardware.ICamera string have not been changed (but is looks like the camera service and client one should undergo the same procedure) The implementation of the interface must provide a unique string for it's interface name. Currently all these strings in the media framework start with 'android.hardware' when it should really be 'android.media', the interface token has nothing to do with hardware. --- media/libmedia/IMediaMetadataRetriever.cpp | 3 +-- media/libmedia/IMediaPlayer.cpp | 3 +-- media/libmedia/IMediaPlayerClient.cpp | 3 +-- media/libmedia/IMediaPlayerService.cpp | 2 +- media/libmedia/IMediaRecorder.cpp | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/media/libmedia/IMediaMetadataRetriever.cpp b/media/libmedia/IMediaMetadataRetriever.cpp index d16394f88d0ca..397a55bda6f87 100644 --- a/media/libmedia/IMediaMetadataRetriever.cpp +++ b/media/libmedia/IMediaMetadataRetriever.cpp @@ -126,7 +126,7 @@ public: } }; -IMPLEMENT_META_INTERFACE(MediaMetadataRetriever, "android.hardware.IMediaMetadataRetriever"); +IMPLEMENT_META_INTERFACE(MediaMetadataRetriever, "android.media.IMediaMetadataRetriever"); // ---------------------------------------------------------------------- @@ -209,4 +209,3 @@ status_t BnMediaMetadataRetriever::onTransact( // ---------------------------------------------------------------------------- }; // namespace android - diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp index e1bed5f52de79..fa2d81dfcba39 100644 --- a/media/libmedia/IMediaPlayer.cpp +++ b/media/libmedia/IMediaPlayer.cpp @@ -172,7 +172,7 @@ public: } }; -IMPLEMENT_META_INTERFACE(MediaPlayer, "android.hardware.IMediaPlayer"); +IMPLEMENT_META_INTERFACE(MediaPlayer, "android.media.IMediaPlayer"); // ---------------------------------------------------------------------- @@ -268,4 +268,3 @@ status_t BnMediaPlayer::onTransact( // ---------------------------------------------------------------------------- }; // namespace android - diff --git a/media/libmedia/IMediaPlayerClient.cpp b/media/libmedia/IMediaPlayerClient.cpp index da4f7ef06b564..bf51829baff4f 100644 --- a/media/libmedia/IMediaPlayerClient.cpp +++ b/media/libmedia/IMediaPlayerClient.cpp @@ -46,7 +46,7 @@ public: } }; -IMPLEMENT_META_INTERFACE(MediaPlayerClient, "android.hardware.IMediaPlayerClient"); +IMPLEMENT_META_INTERFACE(MediaPlayerClient, "android.media.IMediaPlayerClient"); // ---------------------------------------------------------------------- @@ -68,4 +68,3 @@ status_t BnMediaPlayerClient::onTransact( } }; // namespace android - diff --git a/media/libmedia/IMediaPlayerService.cpp b/media/libmedia/IMediaPlayerService.cpp index a79d4f782233f..33b3e22e2b057 100644 --- a/media/libmedia/IMediaPlayerService.cpp +++ b/media/libmedia/IMediaPlayerService.cpp @@ -111,7 +111,7 @@ public: } }; -IMPLEMENT_META_INTERFACE(MediaPlayerService, "android.hardware.IMediaPlayerService"); +IMPLEMENT_META_INTERFACE(MediaPlayerService, "android.media.IMediaPlayerService"); // ---------------------------------------------------------------------- diff --git a/media/libmedia/IMediaRecorder.cpp b/media/libmedia/IMediaRecorder.cpp index 53b5aa3b9ce7f..df7d301fa65a1 100644 --- a/media/libmedia/IMediaRecorder.cpp +++ b/media/libmedia/IMediaRecorder.cpp @@ -264,7 +264,7 @@ public: } }; -IMPLEMENT_META_INTERFACE(MediaRecorder, "android.hardware.IMediaRecorder"); +IMPLEMENT_META_INTERFACE(MediaRecorder, "android.media.IMediaRecorder"); // ----------------------------------------------------------------------