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

Commit e6884f53 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Automerger Merge Worker
Browse files

Merge "Change MR2Manager.Callback to interface" into sc-dev am: c5a8e952 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13434965

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3dbfce008bed7cf4c3ca87e45ef090fdb4cb20e2
parents 5247c749 c5a8e952

media/java/android/media/MediaRouter2Manager.java

+10 −11
Original line number Diff line number Diff line
@@ -879,38 +879,37 @@ public final class MediaRouter2Manager { 
    /**

     * Interface for receiving events about media routing changes.

     */

    public static class Callback {



    public interface Callback {

        /**

         * Called when routes are added.

         * @param routes the list of routes that have been added. It's never empty.

         */

        public void onRoutesAdded(@NonNull List<MediaRoute2Info> routes) {}

        default void onRoutesAdded(@NonNull List<MediaRoute2Info> routes) {}



        /**

         * Called when routes are removed.

         * @param routes the list of routes that have been removed. It's never empty.

         */

        public void onRoutesRemoved(@NonNull List<MediaRoute2Info> routes) {}

        default void onRoutesRemoved(@NonNull List<MediaRoute2Info> routes) {}



        /**

         * Called when routes are changed.

         * @param routes the list of routes that have been changed. It's never empty.

         */

        public void onRoutesChanged(@NonNull List<MediaRoute2Info> routes) {}

        default void onRoutesChanged(@NonNull List<MediaRoute2Info> routes) {}



        /**

         * Called when a session is changed.

         * @param session the updated session

         */

        public void onSessionUpdated(@NonNull RoutingSessionInfo session) {}

        default void onSessionUpdated(@NonNull RoutingSessionInfo session) {}



        /**

         * Called when a session is released.

         * @param session the released session.

         * @see #releaseSession(RoutingSessionInfo)

         */

        public void onSessionReleased(@NonNull RoutingSessionInfo session) {}

        default void onSessionReleased(@NonNull RoutingSessionInfo session) {}



        /**

         * Called when media is transferred.
@@ -918,13 +917,13 @@ public final class MediaRouter2Manager { 
         * @param oldSession the previous session

         * @param newSession the new session or {@code null} if the session is released.

         */

        public void onTransferred(@NonNull RoutingSessionInfo oldSession,

        default void onTransferred(@NonNull RoutingSessionInfo oldSession,

                @Nullable RoutingSessionInfo newSession) { }



        /**

         * Called when {@link #transfer(RoutingSessionInfo, MediaRoute2Info)} fails.

         */

        public void onTransferFailed(@NonNull RoutingSessionInfo session,

        default void onTransferFailed(@NonNull RoutingSessionInfo session,

                @NonNull MediaRoute2Info route) { }



        /**
@@ -933,7 +932,7 @@ public final class MediaRouter2Manager { 
         * @param packageName the package name of the application

         * @param preferredFeatures the list of preferred route features set by an application.

         */

        public void onPreferredFeaturesChanged(@NonNull String packageName,

        default void onPreferredFeaturesChanged(@NonNull String packageName,

                @NonNull List<String> preferredFeatures) {}



        /**
@@ -946,7 +945,7 @@ public final class MediaRouter2Manager { 
         *               {@link MediaRoute2ProviderService#REASON_ROUTE_NOT_AVAILABLE},

         *               {@link MediaRoute2ProviderService#REASON_INVALID_COMMAND},

         */

        public void onRequestFailed(int reason) {}

        default void onRequestFailed(int reason) {}

    }



    final class CallbackRecord {

media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ public class MediaRouter2ManagerTest { 


        CountDownLatch latch = new CountDownLatch(1);



        addManagerCallback(new MediaRouter2Manager.Callback());

        addManagerCallback(new MediaRouter2Manager.Callback() {});

        addRouterCallback(new MediaRouter2.RouteCallback() {});

        addTransferCallback(new MediaRouter2.TransferCallback() {

            @Override
@@ -530,7 +530,7 @@ public class MediaRouter2ManagerTest { 
    @Test

    public void testSetSystemRouteVolume() throws Exception {

        // ensure client

        addManagerCallback(new MediaRouter2Manager.Callback());

        addManagerCallback(new MediaRouter2Manager.Callback() {});

        String selectedSystemRouteId =

                MediaRouter2Utils.getOriginalId(

                mManager.getActiveSessions().get(0).getSelectedRoutes().get(0));
@@ -902,7 +902,7 @@ public class MediaRouter2ManagerTest { 


    private void releaseAllSessions() {

        // ensure ManagerRecord in MediaRouter2ServiceImpl

        addManagerCallback(new MediaRouter2Manager.Callback());

        addManagerCallback(new MediaRouter2Manager.Callback() {});



        for (RoutingSessionInfo session : mManager.getActiveSessions()) {

            mManager.releaseSession(session);

packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ public class InfoMediaManager extends MediaManager { 
        }

    }



    class RouterManagerCallback extends MediaRouter2Manager.Callback {

    class RouterManagerCallback implements MediaRouter2Manager.Callback {



        @Override

        public void onRoutesAdded(List<MediaRoute2Info> routes) {