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

Commit 2d4fe896 authored by Sungsoo Lim's avatar Sungsoo Lim
Browse files

Remove unnecesaary constants of Session2Command 

As ABI, we don't need to have all the constants defined
in AndroidX media2.

Bug: 121230641
Test: build
Change-Id: Ic6a8e1bfa8a3251a97fa5609542eabbfda1ebbac
parent c6cfa0f7

media/java/android/media/MediaSession2.java

+4 −7
Original line number Original line Diff line number Diff line
@@ -643,7 +643,7 @@ public class MediaSession2 implements AutoCloseable { 
    public abstract static class SessionCallback {

    public abstract static class SessionCallback {

        /**

        /**

         * Called when a controller is created for this session. Return allowed commands for

         * Called when a controller is created for this session. Return allowed commands for

         * controller. By default it allows all connection requests and commands.

         * controller. By default it returns {@code null}.

         * <p>

         * <p>

         * You can reject the connection by returning {@code null}. In that case, controller

         * You can reject the connection by returning {@code null}. In that case, controller

         * receives {@link MediaController2.ControllerCallback#onDisconnected(MediaController2)}

         * receives {@link MediaController2.ControllerCallback#onDisconnected(MediaController2)}
@@ -656,10 +656,7 @@ public class MediaSession2 implements AutoCloseable { 
        @Nullable

        @Nullable

        public Session2CommandGroup onConnect(@NonNull MediaSession2 session,

        public Session2CommandGroup onConnect(@NonNull MediaSession2 session,

                @NonNull ControllerInfo controller) {

                @NonNull ControllerInfo controller) {

            Session2CommandGroup commands = new Session2CommandGroup.Builder()

            return null;

                    .addAllPredefinedCommands(Session2Command.COMMAND_VERSION_1)

                    .build();

            return commands;

        }

        }





        /**

        /**

media/java/android/media/Session2Command.java

+9 −537

File changed.

Preview size limit exceeded, changes collapsed.

media/java/android/media/Session2CommandGroup.java

+14 −112

File changed.

Preview size limit exceeded, changes collapsed.

media/java/android/media/MediaController2.java

+5 −5

File changed.

Contains only whitespace changes.