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

Commit 7f197298 authored by Santiago Seifert's avatar Santiago Seifert Committed by Android (Google) Code Review
Browse files

Merge "Remove unused parameter in callback" into main

parents ed4f50f3 25a2f63e

services/core/java/com/android/server/media/AudioPoliciesBluetoothRouteController.java

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ import java.util.Set; 
    }



    private void notifyBluetoothRoutesUpdated() {

        mListener.onBluetoothRoutesUpdated(getAllBluetoothRoutes());

        mListener.onBluetoothRoutesUpdated();

    }



    private BluetoothRouteInfo createBluetoothRoute(BluetoothDevice device) {

services/core/java/com/android/server/media/AudioPoliciesDeviceRouteController.java

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ import java.util.Objects; 
            }



            if (isDeviceRouteChanged) {

                mOnDeviceRouteChangedListener.onDeviceRouteChanged(deviceRoute);

                mOnDeviceRouteChangedListener.onDeviceRouteChanged();

            }

        }

    }

services/core/java/com/android/server/media/BluetoothRouteController.java

+2 −6
Original line number Diff line number Diff line
@@ -136,12 +136,8 @@ import java.util.Objects; 
     */

    interface BluetoothRoutesUpdatedListener {



        /**

         * Called when Bluetooth routes have changed.

         *

         * @param routes updated Bluetooth routes list.

         */

        void onBluetoothRoutesUpdated(@NonNull List<MediaRoute2Info> routes);

        /** Called when Bluetooth routes have changed. */

        void onBluetoothRoutesUpdated();

    }



    /**

services/core/java/com/android/server/media/DeviceRouteController.java

+2 −6
Original line number Diff line number Diff line
@@ -93,12 +93,8 @@ import com.android.media.flags.Flags; 
     */

    interface OnDeviceRouteChangedListener {



        /**

         * Called when device route has changed.

         *

         * @param deviceRoute non-null device route.

         */

        void onDeviceRouteChanged(@NonNull MediaRoute2Info deviceRoute);

        /** Called when device route has changed. */

        void onDeviceRouteChanged();

    }



}

services/core/java/com/android/server/media/LegacyBluetoothRouteController.java

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ class LegacyBluetoothRouteController implements BluetoothRouteController { 


    private void notifyBluetoothRoutesUpdated() {

        if (mListener != null) {

            mListener.onBluetoothRoutesUpdated(getAllBluetoothRoutes());

            mListener.onBluetoothRoutesUpdated();

        }

    }