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

Commit d3cc889f authored by Jaewan Kim's avatar Jaewan Kim Committed by android-build-merger
Browse files

Merge "MediaSession2: Change return type of CommandGroup#getCommands()" into pi-dev 

am: d21b33d8

Change-Id: Ic29104fbe78b9f3d022acaab7debdf1c9b38dd3a
parents defbb859 d21b33d8

media/java/android/media/MediaSession2.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ import android.os.ResultReceiver; 
import java.lang.annotation.Retention;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.RetentionPolicy;

import java.util.List;

import java.util.List;

import java.util.Set;

import java.util.concurrent.Executor;

import java.util.concurrent.Executor;





/**

/**
@@ -557,7 +558,7 @@ public class MediaSession2 implements AutoCloseable { 
            return mProvider.hasCommand_impl(code);

            return mProvider.hasCommand_impl(code);

        }

        }





        public @NonNull List<Command> getCommands() {

        public @NonNull Set<Command> getCommands() {

            return mProvider.getCommands_impl();

            return mProvider.getCommands_impl();

        }

        }

media/java/android/media/update/MediaSession2Provider.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ import android.os.Bundle; 
import android.os.ResultReceiver;

import android.os.ResultReceiver;





import java.util.List;

import java.util.List;

import java.util.Set;

import java.util.concurrent.Executor;

import java.util.concurrent.Executor;





/**

/**
@@ -87,7 +88,7 @@ public interface MediaSession2Provider extends TransportControlProvider { 
        void removeCommand_impl(Command command);

        void removeCommand_impl(Command command);

        boolean hasCommand_impl(Command command);

        boolean hasCommand_impl(Command command);

        boolean hasCommand_impl(int code);

        boolean hasCommand_impl(int code);

        List<Command> getCommands_impl();

        Set<Command> getCommands_impl();

        Bundle toBundle_impl();

        Bundle toBundle_impl();

    }

    }