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

Commit 16114485 authored by Oliver Woodman's avatar Oliver Woodman Committed by Automerger Merge Worker
Browse files

Merge "Fix pushing null queue update" into tm-dev am: 963dabe7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16976024

Change-Id: I4e6d24cd3db595732364c6fc67c06b2415a0bf8b
parents 54e90120 963dabe7

services/core/java/com/android/server/media/MediaSessionRecord.java

+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);