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

Commit 74e5f01d authored by android-build-prod (mdb)'s avatar android-build-prod (mdb) Committed by android-build-merger
Browse files

Merge "MediaPlayerList: Prevent NPE in wrapper.cleanup()" 

am: 26d25ac9

Change-Id: Ic403dd230676757811bed6900090aff556fe0d3c
parents 87ab7e61 26d25ac9

src/com/android/bluetooth/newavrcp/MediaPlayerList.java

+2 −2
Original line number Diff line number Diff line
@@ -447,11 +447,11 @@ public class MediaPlayerList { 
            mActivePlayerId = NO_ACTIVE_PLAYER;

        }



        MediaPlayerWrapper wrapper = mMediaPlayers.get(playerId);

        final MediaPlayerWrapper wrapper = mMediaPlayers.get(playerId);

        d("Removing media player " + wrapper.getPackageName());

        mMediaPlayerIds.remove(wrapper.getPackageName());

        mMediaPlayers.remove(playerId);

        mMediaPlayers.get(playerId).cleanup();

        wrapper.cleanup();

    }



    void setActivePlayer(int playerId) {