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

Commit f4552af5 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun
Browse files

MediaRouter: Rename methods in TransferCallback 

Bug: 151455138
Test: cts test and atest mediaroutertest
Change-Id: I2bfc5c6c4ac6730d1a7162cd9516092ec64d16e7
parent 8c224313

api/current.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -27102,9 +27102,9 @@ package android.media { 
















  public abstract static class MediaRouter2.TransferCallback {







  public abstract static class MediaRouter2.TransferCallback {











    ctor public MediaRouter2.TransferCallback();







    ctor public MediaRouter2.TransferCallback();











    method public void onStopped(@NonNull android.media.MediaRouter2.RoutingController);







    method public void onStop(@NonNull android.media.MediaRouter2.RoutingController);











    method public void onTransferFailed(@NonNull android.media.MediaRoute2Info);







    method public void onTransfer(@NonNull android.media.MediaRouter2.RoutingController, @NonNull android.media.MediaRouter2.RoutingController);











    method public void onTransferred(@NonNull android.media.MediaRouter2.RoutingController, @NonNull android.media.MediaRouter2.RoutingController);







    method public void onTransferFailure(@NonNull android.media.MediaRoute2Info);











  }







  }



























  public class MediaScannerConnection implements android.content.ServiceConnection {







  public class MediaScannerConnection implements android.content.ServiceConnection {

























media/java/android/media/MediaRouter2.java



+10
−10




























Original line number
Original line
Diff line number
Diff line








@@ -374,8 +374,8 @@ public final class MediaRouter2 {









     * @param route the route you want to transfer the current media to. Pass {@code null} to







     * @param route the route you want to transfer the current media to. Pass {@code null} to











     *              stop routing of the current media.







     *              stop routing of the current media.











     *







     *











     * @see TransferCallback#onTransferred







     * @see TransferCallback#onTransfer











     * @see TransferCallback#onTransferFailed







     * @see TransferCallback#onTransferFailure











     */







     */











    public void transferTo(@NonNull MediaRoute2Info route) {







    public void transferTo(@NonNull MediaRoute2Info route) {











        Objects.requireNonNull(route, "route must not be null");







        Objects.requireNonNull(route, "route must not be null");










@@ -565,9 +565,9 @@ public final class MediaRouter2 {









    }







    }































    /**







    /**











     * Creates a controller and calls the {@link TransferCallback#onTransferred}.







     * Creates a controller and calls the {@link TransferCallback#onTransfer}.











     * If the controller creation has failed, then it calls







     * If the controller creation has failed, then it calls











     * {@link TransferCallback#onTransferFailed}.







     * {@link TransferCallback#onTransferFailure}.











     * <p>







     * <p>











     * Pass {@code null} to sessionInfo for the failure case.







     * Pass {@code null} to sessionInfo for the failure case.











     */







     */










@@ -740,21 +740,21 @@ public final class MediaRouter2 {









            RoutingController newController) {







            RoutingController newController) {











        for (TransferCallbackRecord record: mTransferCallbackRecords) {







        for (TransferCallbackRecord record: mTransferCallbackRecords) {











            record.mExecutor.execute(







            record.mExecutor.execute(











                    () -> record.mTransferCallback.onTransferred(oldController, newController));







                    () -> record.mTransferCallback.onTransfer(oldController, newController));











        }







        }











    }







    }































    private void notifyTransferFailed(MediaRoute2Info route) {







    private void notifyTransferFailed(MediaRoute2Info route) {











        for (TransferCallbackRecord record: mTransferCallbackRecords) {







        for (TransferCallbackRecord record: mTransferCallbackRecords) {











            record.mExecutor.execute(







            record.mExecutor.execute(











                    () -> record.mTransferCallback.onTransferFailed(route));







                    () -> record.mTransferCallback.onTransferFailure(route));











        }







        }











    }







    }































    private void notifyStopped(RoutingController controller) {







    private void notifyStopped(RoutingController controller) {











        for (TransferCallbackRecord record: mTransferCallbackRecords) {







        for (TransferCallbackRecord record: mTransferCallbackRecords) {











            record.mExecutor.execute(







            record.mExecutor.execute(











                    () -> record.mTransferCallback.onStopped(controller));







                    () -> record.mTransferCallback.onStop(controller));











        }







        }











    }







    }






























@@ -805,7 +805,7 @@ public final class MediaRouter2 {









         * @param newController the new controller to control routing







         * @param newController the new controller to control routing











         * @see #transferTo(MediaRoute2Info)







         * @see #transferTo(MediaRoute2Info)











         */







         */











        public void onTransferred(@NonNull RoutingController oldController,







        public void onTransfer(@NonNull RoutingController oldController,











                @NonNull RoutingController newController) {}







                @NonNull RoutingController newController) {}































        /**







        /**









@@ -813,14 +813,14 @@ public final class MediaRouter2 {









         *







         *











         * @param requestedRoute the route info which was used for the transfer







         * @param requestedRoute the route info which was used for the transfer











         */







         */











        public void onTransferFailed(@NonNull MediaRoute2Info requestedRoute) {}







        public void onTransferFailure(@NonNull MediaRoute2Info requestedRoute) {}































        /**







        /**











         * Called when a media routing stops. It can be stopped by a user or a provider.







         * Called when a media routing stops. It can be stopped by a user or a provider.











         *







         *











         * @param controller the controller that controlled the stopped media routing.







         * @param controller the controller that controlled the stopped media routing.











         */







         */











        public void onStopped(@NonNull RoutingController controller) { }







        public void onStop(@NonNull RoutingController controller) { }











    }







    }































    /**







    /**

































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



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -204,7 +204,7 @@ public class MediaRouter2ManagerTest {









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







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











        addTransferCallback(new MediaRouter2.TransferCallback() {







        addTransferCallback(new MediaRouter2.TransferCallback() {











            @Override







            @Override











            public void onTransferred(MediaRouter2.RoutingController oldController,







            public void onTransfer(MediaRouter2.RoutingController oldController,











                    MediaRouter2.RoutingController newController) {







                    MediaRouter2.RoutingController newController) {











                if (newController == null) {







                if (newController == null) {











                    return;







                    return;