Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc9a5a0f authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Continue refactoring MediaFocusControl"

parents e80ba69d dda1c404

media/java/android/media/MediaFocusControl.java

+184 −184

File changed.

Preview size limit exceeded, changes collapsed.

media/java/android/media/MediaController.java→media/java/android/media/PlayerRecord.java

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import java.io.PrintWriter; 
 * instance is managed by android.media.MediaFocusControl, from its addition to the player stack

 * stack to its release.

 */

class MediaController implements DeathRecipient {

class PlayerRecord implements DeathRecipient {



    // on purpose not using this classe's name, as it will only be used from MediaFocusControl

    private static final String TAG = "MediaFocusControl";
@@ -213,7 +213,7 @@ class MediaController implements DeathRecipient { 
    }



    /** precondition: mediaIntent != null */

    protected MediaController(PendingIntent mediaIntent, ComponentName eventReceiver, IBinder token)

    protected PlayerRecord(PendingIntent mediaIntent, ComponentName eventReceiver, IBinder token)

    {

        mMediaIntent = mediaIntent;

        mReceiverComponent = eventReceiver;