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

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

Merge "AVRCP: fix PlayItem NPE with no Addressed Player" am: c862d255 am:... 

Merge "AVRCP: fix PlayItem NPE with no Addressed Player" am: c862d255 am: 59d6c6af am: 09ddd1c2
am: 2cf50c3c

Change-Id: I066ba603fbe273bd39cf9a47697be13eaff0e633
parents 2e8e9de7 2cf50c3c

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

+3 −3
Original line number Diff line number Diff line
@@ -2231,11 +2231,11 @@ public final class Avrcp { 
        }



        MediaPlayerInfo info = getAddressedPlayerInfo();

        if (info != null || !info.getPackageName().equals(browsedPlayer)) {

            Log.w(TAG, browsedPlayer + " is not addressed player " + info.getPackageName());

        String packageName = (info == null) ? "<none>" : info.getPackageName();

        if (info == null || !packageName.equals(browsedPlayer)) {

            if (DEBUG) Log.d(TAG, browsedPlayer + " is not addressed player " + packageName);

            return false;

        }



        return true;

    }