Bug 1302336 - Rename ICodecManager into IMediaManager. r=jolin

MozReview-Commit-ID: JGIW3BfAwCI

--HG--
extra : rebase_source : fc520f9badfffaea77d3ed54794ff1c74c453078

mobile/android/base/AndroidManifest.xml.in

@@ -421,7 +421,7 @@
 #endif
 
         <service
-            android:name="org.mozilla.gecko.media.CodecManager"
+            android:name="org.mozilla.gecko.media.MediaManager"
             android:enabled="true"
             android:exported="false"
             android:process=":media"

mobile/android/base/aidl/org/mozilla/gecko/media/IMediaManager.aidl

@@ -7,7 +7,7 @@ package org.mozilla.gecko.media;
 // Non-default types used in interface.
 import org.mozilla.gecko.media.ICodec;
 
-interface ICodecManager {
+interface IMediaManager {
     /** Creates a remote ICodec object. */
     ICodec createCodec();
 }

mobile/android/base/java/org/mozilla/gecko/media/MediaManager.java

@@ -10,8 +10,8 @@ import android.os.Binder;
 import android.os.IBinder;
 import android.os.RemoteException;
 
-public final class CodecManager extends Service {
-    private Binder mBinder = new ICodecManager.Stub() {
+public final class MediaManager extends Service {
+    private Binder mBinder = new IMediaManager.Stub() {
         @Override
         public ICodec createCodec() throws RemoteException {
             return new Codec();

mobile/android/base/java/org/mozilla/gecko/media/RemoteManager.java

@@ -37,7 +37,7 @@ public final class RemoteManager implements IBinder.DeathRecipient {
     }
 
     private List<CodecProxy> mProxies = new LinkedList<CodecProxy>();
-    private volatile ICodecManager mRemote;
+    private volatile IMediaManager mRemote;
     private volatile CountDownLatch mConnectionLatch;
     private final ServiceConnection mConnection = new ServiceConnection() {
         @Override
@@ -48,7 +48,7 @@ public final class RemoteManager implements IBinder.DeathRecipient {
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
-            mRemote = ICodecManager.Stub.asInterface(service);
+            mRemote = IMediaManager.Stub.asInterface(service);
             if (mConnectionLatch != null) {
                 mConnectionLatch.countDown();
             }
@@ -83,7 +83,7 @@ public final class RemoteManager implements IBinder.DeathRecipient {
         if (DEBUG) Log.d(LOGTAG, "init remote manager " + this);
         Context appCtxt = GeckoAppShell.getApplicationContext();
         if (DEBUG) Log.d(LOGTAG, "ctxt=" + appCtxt);
-        appCtxt.bindService(new Intent(appCtxt, CodecManager.class),
+        appCtxt.bindService(new Intent(appCtxt, MediaManager.class),
                 mConnection, Context.BIND_AUTO_CREATE);
         if (!waitConnection()) {
             appCtxt.unbindService(mConnection);

mobile/android/base/moz.build

@@ -558,11 +558,11 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'media/AsyncCodecFactory.java',
     'media/AudioFocusAgent.java',
     'media/Codec.java',
-    'media/CodecManager.java',
     'media/CodecProxy.java',
     'media/FormatParam.java',
     'media/JellyBeanAsyncCodec.java',
     'media/MediaControlService.java',
+    'media/MediaManager.java',
     'media/RemoteManager.java',
     'media/Sample.java',
     'media/VideoPlayer.java',
@@ -1109,5 +1109,5 @@ OBJDIR_PP_FILES.mobile.android.base += [
 gbjar.sources += ['generated/org/mozilla/gecko/' + x for x in [
     'media/ICodec.java',
     'media/ICodecCallbacks.java',
-    'media/ICodecManager.java',
+    'media/IMediaManager.java',
 ]]