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

Commit eace1237 authored by Marie Janssen's avatar Marie Janssen Committed by android-build-merger
Browse files

Merge "AVRCP: use only one MediaController from a package" am: 2e15e66b am: 2dcab1cc 

am: 96275b4d

Change-Id: I1c3c547ca9a9f6d0d152d6e1b8ed6c5ab56dac4b
parents fd6677b1 96275b4d

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -57,9 +57,11 @@ import com.android.bluetooth.Utils; 
import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Collections;

import java.util.Collections;

import java.util.HashMap;

import java.util.HashMap;

import java.util.HashSet;

import java.util.Iterator;

import java.util.Iterator;

import java.util.List;

import java.util.List;

import java.util.Map;

import java.util.Map;

import java.util.Set;

import java.util.SortedMap;

import java.util.SortedMap;

import java.util.TreeMap;

import java.util.TreeMap;
@@ -1582,9 +1584,15 @@ public final class Avrcp { 
                @Override

                @Override

                public void onActiveSessionsChanged(

                public void onActiveSessionsChanged(

                        List<android.media.session.MediaController> newControllers) {

                        List<android.media.session.MediaController> newControllers) {

                    Set<String> updatedPackages = new HashSet<String>();

                    // Update the current players

                    // Update the current players

                    for (android.media.session.MediaController controller : newControllers) {

                    for (android.media.session.MediaController controller : newControllers) {

                        String packageName = controller.getPackageName();

                        if (DEBUG) Log.v(TAG, "ActiveSession: " + MediaController.wrap(controller));

                        // Only use the first (highest priority) controller from each package

                        if (updatedPackages.contains(packageName)) continue;

                        addMediaPlayerController(controller);

                        addMediaPlayerController(controller);

                        updatedPackages.add(packageName);

                    }

                    }





                    if (newControllers.size() > 0 && getAddressedPlayerInfo() == null) {

                    if (newControllers.size() > 0 && getAddressedPlayerInfo() == null) {