Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Oliver Woodman
2022-02-22 18:01:53 +00:00
committed by Android (Google) Code Review
parent f7906f2760 2e6da28957
commit 963dabe7fe
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/media/MediaSessionRecord.java
View File

@@ -647,18 +647,17 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR
if (mDestroyed) { if (mDestroyed) {
return; return;
} }
toSend = new ArrayList<>(); toSend = mQueue == null ? null : new ArrayList<>(mQueue);
if (mQueue != null) {
toSend.ensureCapacity(mQueue.size());
toSend.addAll(mQueue);
}
} }
Collection<ISessionControllerCallbackHolder> deadCallbackHolders = null; Collection<ISessionControllerCallbackHolder> deadCallbackHolders = null;
for (ISessionControllerCallbackHolder holder : mControllerCallbackHolders) { 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 // Limit the size of initial Parcel to prevent binder buffer overflow
// as onQueueChanged is an async binder call. // as onQueueChanged is an async binder call.
parcelableQueue.setInlineCountLimit(1); parcelableQueue.setInlineCountLimit(1);
}
try { try {
holder.mCallback.onQueueChanged(parcelableQueue); holder.mCallback.onQueueChanged(parcelableQueue);