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

Commit b065a3ed authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Revert "Use Collections for empty list return"" into main am: c47a45d3 am: 6a4a1a31 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3017757



Change-Id: I49c5b3a1571873e824ffb42ec56690730b991e16
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3db36559 6a4a1a31

android/app/src/com/android/bluetooth/a2dp/A2dpService.java

+3 −4
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ import com.android.internal.annotations.GuardedBy; 
import com.android.internal.annotations.VisibleForTesting;



import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Objects;

import java.util.concurrent.ConcurrentHashMap;
@@ -1365,7 +1364,7 @@ public class A2dpService extends ProfileService { 
        public List<BluetoothDevice> getConnectedDevices(AttributionSource source) {

            A2dpService service = getService(source);

            if (service == null) {

                return Collections.emptyList();

                return new ArrayList<>();

            }



            return service.getConnectedDevices();
@@ -1376,7 +1375,7 @@ public class A2dpService extends ProfileService { 
                int[] states, AttributionSource source) {

            A2dpService service = getService(source);

            if (service == null) {

                return Collections.emptyList();

                return new ArrayList<>();

            }



            return service.getDevicesMatchingConnectionStates(states);
@@ -1468,7 +1467,7 @@ public class A2dpService extends ProfileService { 
        public List<BluetoothCodecType> getSupportedCodecTypes(AttributionSource source) {

            A2dpService service = getService(source);

            if (service == null) {

                return Collections.emptyList();

                return new ArrayList<>();

            }



            enforceBluetoothPrivilegedPermission(service);

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java

+2 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.android.internal.annotations.VisibleForTesting; 


import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.List;

import java.util.Map;

import java.util.concurrent.ConcurrentHashMap;
@@ -249,7 +248,7 @@ public class A2dpSinkService extends ProfileService { 
        public List<BluetoothDevice> getConnectedDevices(AttributionSource source) {

            A2dpSinkService service = getService(source);

            if (service == null) {

                return Collections.emptyList();

                return new ArrayList<BluetoothDevice>(0);

            }

            return service.getConnectedDevices();

        }
@@ -259,7 +258,7 @@ public class A2dpSinkService extends ProfileService { 
                int[] states, AttributionSource source) {

            A2dpSinkService service = getService(source);

            if (service == null) {

                return Collections.emptyList();

                return new ArrayList<BluetoothDevice>(0);

            }

            return service.getDevicesMatchingConnectionStates(states);

        }

android/app/src/com/android/bluetooth/audio_util/helpers/Util.java

+3 −4
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.util.Log; 
import com.android.bluetooth.R;



import java.util.ArrayList;

import java.util.Collections;

import java.util.List;



class Util {
@@ -118,15 +117,15 @@ class Util { 
     */

    public static List<Metadata> toMetadataList(Context context,

            List<MediaSession.QueueItem> items) {

        ArrayList<Metadata> list = new ArrayList<Metadata>();



        if (items == null) return Collections.emptyList();

        if (items == null) return list;



        ArrayList<Metadata> list = new ArrayList<Metadata>();

        for (int i = 0; i < items.size(); i++) {

            Metadata data = toMetadata(context, items.get(i));

            if (isEmptyData(data)) {

                Log.e(TAG, "Received an empty Metadata item in list. Returning an empty queue");

                return Collections.emptyList();

                return new ArrayList<Metadata>();

            }

            data.trackNum = "" + (i + 1);

            data.numTracks = "" + items.size();

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerService.java

+2 −3
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import com.android.internal.annotations.VisibleForTesting; 


import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.List;

import java.util.Map;

import java.util.UUID;
@@ -383,7 +382,7 @@ public class AvrcpControllerService extends ProfileService { 
        public List<BluetoothDevice> getConnectedDevices(AttributionSource source) {

            AvrcpControllerService service = getService(source);

            if (service == null) {

                return Collections.emptyList();

                return new ArrayList<BluetoothDevice>(0);

            }

            return service.getConnectedDevices();

        }
@@ -393,7 +392,7 @@ public class AvrcpControllerService extends ProfileService { 
                int[] states, AttributionSource source) {

            AvrcpControllerService service = getService(source);

            if (service == null) {

                return Collections.emptyList();

                return new ArrayList<BluetoothDevice>(0);

            }

            return service.getDevicesMatchingConnectionStates(states);

        }

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ class AvrcpControllerStateMachine extends StateMachine { 
        if (mCoverArtManager == null) return;

        AvrcpItem currentTrack = getCurrentTrack();

        String currentTrackUuid = currentTrack != null ? currentTrack.getCoverArtUuid() : null;

        List<String> unusedArtwork = mBrowseTree.getAndClearUnusedCoverArt();

        ArrayList<String> unusedArtwork = mBrowseTree.getAndClearUnusedCoverArt();

        for (String uuid : unusedArtwork) {

            if (!uuid.equals(currentTrackUuid)) {

                mCoverArtManager.removeImage(mDevice, uuid);