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

Commit aea88920 authored by slki.shin's avatar slki.shin Committed by android-build-merger
Browse files

Merge "Fix null pointer exception on AvrcpTargetService" am: cd4a4fe1 am:...

Merge "Fix null pointer exception on AvrcpTargetService" am: cd4a4fe1 am: 64327380 am: 84253869
am: dfe558d4

Change-Id: I1a99aae2a7abcd6ac7d69a417fb303dcb035f3e4
parents 2c4ce417 dfe558d4
Loading
Loading
Loading
Loading
+4 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,8 @@ public class AvrcpTargetService extends ProfileService {
            MediaPlayerList.FolderUpdateCallback {
            MediaPlayerList.FolderUpdateCallback {
        @Override
        @Override
        public void run(MediaData data) {
        public void run(MediaData data) {
            if (mNativeInterface == null) return;

            boolean metadata = !Objects.equals(mCurrentData.metadata, data.metadata);
            boolean metadata = !Objects.equals(mCurrentData.metadata, data.metadata);
            boolean state = !MediaPlayerWrapper.playstateEquals(mCurrentData.state, data.state);
            boolean state = !MediaPlayerWrapper.playstateEquals(mCurrentData.state, data.state);
            boolean queue = !Objects.equals(mCurrentData.queue, data.queue);
            boolean queue = !Objects.equals(mCurrentData.queue, data.queue);
@@ -84,6 +86,8 @@ public class AvrcpTargetService extends ProfileService {
        @Override
        @Override
        public void run(boolean availablePlayers, boolean addressedPlayers,
        public void run(boolean availablePlayers, boolean addressedPlayers,
                boolean uids) {
                boolean uids) {
            if (mNativeInterface == null) return;

            mNativeInterface.sendFolderUpdate(availablePlayers, addressedPlayers, uids);
            mNativeInterface.sendFolderUpdate(availablePlayers, addressedPlayers, uids);
        }
        }
    }
    }