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

Commit d52cdfb8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Simplify the media button handling logic"

parents 55bea5e3 92dea33b

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -24337,9 +24337,9 @@ package android.media.session { 
    method public void setRepeatMode(int);

    method public void setSessionActivity(android.app.PendingIntent);

    method public void setShuffleModeEnabled(boolean);

    field public static final int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1

    field public static final deprecated int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1

    field public static final int FLAG_HANDLES_QUEUE_COMMANDS = 4; // 0x4

    field public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2

    field public static final deprecated int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2

  }















  public static abstract class MediaSession.Callback {

























api/system-current.txt



+2
−2




























Original line number
Diff line number
Diff line








@@ -26207,9 +26207,9 @@ package android.media.session {













    method public void setRepeatMode(int);















    method public void setSessionActivity(android.app.PendingIntent);















    method public void setShuffleModeEnabled(boolean);













    field public static final int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1













    field public static final deprecated int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1















    field public static final int FLAG_HANDLES_QUEUE_COMMANDS = 4; // 0x4













    field public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2













    field public static final deprecated int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2















  }





























  public static abstract class MediaSession.Callback {

























api/test-current.txt



+2
−2




























Original line number
Diff line number
Diff line








@@ -24448,9 +24448,9 @@ package android.media.session {













    method public void setRepeatMode(int);















    method public void setSessionActivity(android.app.PendingIntent);















    method public void setShuffleModeEnabled(boolean);













    field public static final int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1













    field public static final deprecated int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1















    field public static final int FLAG_HANDLES_QUEUE_COMMANDS = 4; // 0x4













    field public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2













    field public static final deprecated int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2















  }





























  public static abstract class MediaSession.Callback {

























media/java/android/media/session/MediaSession.java



+6
−0




























Original line number
Diff line number
Diff line








@@ -77,13 +77,19 @@ public final class MediaSession {













    /**















     * Set this flag on the session to indicate that it can handle media button















     * events.













     * @deprecated This flag is no longer used. All media sessions are expected to handle media













     * button events now.















     */













    @Deprecated















    public static final int FLAG_HANDLES_MEDIA_BUTTONS = 1 << 0;































    /**















     * Set this flag on the session to indicate that it handles transport















     * control commands through its {@link Callback}.













     * @deprecated This flag is no longer used. All media sessions are expected to handle transport













     * controls now.















     */













    @Deprecated















    public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 1 << 1;































    /**

































services/core/java/com/android/server/audio/AudioService.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -6555,7 +6555,7 @@ public class AudioService extends IAudioService.Stub





























    public void registerPlaybackCallback(IPlaybackConfigDispatcher pcdb) {















        final boolean isPrivileged =













                (PackageManager.PERMISSION_GRANTED == mContext.checkCallingPermission(













                (PackageManager.PERMISSION_GRANTED == mContext.checkCallingOrSelfPermission(















                        android.Manifest.permission.MODIFY_AUDIO_ROUTING));















        mPlaybackMonitor.registerPlaybackCallback(pcdb, isPrivileged);















    }









@@ -6566,7 +6566,7 @@ public class AudioService extends IAudioService.Stub





























    public List<AudioPlaybackConfiguration> getActivePlaybackConfigurations() {















        final boolean isPrivileged =













                (PackageManager.PERMISSION_GRANTED == mContext.checkCallingPermission(













                (PackageManager.PERMISSION_GRANTED == mContext.checkCallingOrSelfPermission(















                        android.Manifest.permission.MODIFY_AUDIO_ROUTING));















        return mPlaybackMonitor.getActivePlaybackConfigurations(isPrivileged);















    }