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

Commit 963dabe7 authored by Oliver Woodman's avatar Oliver Woodman Committed by Android (Google) Code Review
Browse files

Merge "Fix pushing null queue update" into tm-dev

parents f7906f27 2e6da289
Loading
Loading
Loading
Loading
+8 −9
Original line number Diff line number Diff line
@@ -647,18 +647,17 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR
            if (mDestroyed) {
                return;
            }
            toSend = new ArrayList<>();
            if (mQueue != null) {
                toSend.ensureCapacity(mQueue.size());
                toSend.addAll(mQueue);
            }
            toSend = mQueue == null ? null : new ArrayList<>(mQueue);
        }
        Collection<ISessionControllerCallbackHolder> deadCallbackHolders = null;
        for (ISessionControllerCallbackHolder holder : mControllerCallbackHolders) {
            ParceledListSlice<QueueItem> parcelableQueue = new ParceledListSlice<>(toSend);
            ParceledListSlice<QueueItem> parcelableQueue = null;
            if (toSend != null) {
                parcelableQueue = new ParceledListSlice<>(toSend);
                // Limit the size of initial Parcel to prevent binder buffer overflow
                // as onQueueChanged is an async binder call.
                parcelableQueue.setInlineCountLimit(1);
            }

            try {
                holder.mCallback.onQueueChanged(parcelableQueue);