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

Commit 06650262 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [2204983, 2209389, 2209362, 2204043, 2205156, 2209221,... 

Merge cherrypicks of [2204983, 2209389, 2209362, 2204043, 2205156, 2209221, 2207314, 2209559, 2209088, 2209386, 2208936, 2209597] into oc-dr1-release

Change-Id: I7fc54b6da9fb74436e80a62e47bcc7fde4fd3424
parents e0cd198d f02ec386

src/com/android/bluetooth/avrcp/Avrcp.java

+5 −3
Original line number Diff line number Diff line
@@ -1769,8 +1769,9 @@ public final class Avrcp { 
                new ArrayList<android.media.session.MediaController>();

        synchronized (mMediaPlayerInfoList) {

            for (MediaPlayerInfo info : mMediaPlayerInfoList.values()) {

                if (info.getMediaController() != null) {

                    controllers.add(info.getMediaController().getWrappedInstance());

                MediaController controller = info.getMediaController();

                if (controller != null) {

                    controllers.add(controller.getWrappedInstance());

                }

            }

        }
@@ -1848,7 +1849,8 @@ public final class Avrcp { 
    private void removeMediaController(android.media.session.MediaController controller) {

        synchronized (mMediaPlayerInfoList) {

            for (MediaPlayerInfo info : mMediaPlayerInfoList.values()) {

                if (info.getMediaController().equals(controller)) info.setMediaController(null);

                MediaController c = info.getMediaController();

                if (c != null && c.equals(controller)) info.setMediaController(null);

            }

        }

    }