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

Commit 279b93ce authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Return current song id if active quene item id is not avaliable" am:... 

Merge "Return current song id if active quene item id is not avaliable" am: aba2a8a4 am: 78b2a922 am: 84792238 am: 76599f9e am: e8a74a54

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



Change-Id: I234713597990f718aba3da44b0306184d1bdb022
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 53429dba e8a74a54

android/app/src/com/android/bluetooth/avrcp/AvrcpTargetService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -384,10 +384,10 @@ public class AvrcpTargetService extends ProfileService { 




    String getCurrentMediaId() {

    String getCurrentMediaId() {

        String id = mMediaPlayerList.getCurrentMediaId();

        String id = mMediaPlayerList.getCurrentMediaId();

        if (id != null) return id;

        if (id != null && !id.isEmpty()) return id;





        Metadata song = getCurrentSongInfo();

        Metadata song = getCurrentSongInfo();

        if (song != null) return song.mediaId;

        if (song != null && !song.mediaId.isEmpty()) return song.mediaId;





        // We always want to return something, the error string just makes debugging easier

        // We always want to return something, the error string just makes debugging easier

        return "error";

        return "error";