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

Commit 2b60d838 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix security vulnerability allowing apps to start from background" into... 

Merge "Fix security vulnerability allowing apps to start from background" into sc-dev am: 408cac13 am: 3b2f30df am: 6a8afefe

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



Change-Id: If359f3da67a43c2a8883eefca4a9c812e974ea7c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ce227eb 6a8afefe

media/java/android/media/session/ParcelableListBinder.java

+11 −2
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ public class ParcelableListBinder<T extends Parcelable> extends Binder { 
    private static final int END_OF_PARCEL = 0;

    private static final int ITEM_CONTINUED = 1;



    private final Class<T> mListElementsClass;

    private final Consumer<List<T>> mConsumer;



    private final Object mLock = new Object();
@@ -61,9 +62,11 @@ public class ParcelableListBinder<T extends Parcelable> extends Binder { 
    /**

     * Creates an instance.

     *

     * @param listElementsClass the class of the list elements.

     * @param consumer a consumer that consumes the list received

     */

    public ParcelableListBinder(@NonNull Consumer<List<T>> consumer) {

    public ParcelableListBinder(Class<T> listElementsClass, @NonNull Consumer<List<T>> consumer) {

        mListElementsClass = listElementsClass;

        mConsumer = consumer;

    }
@@ -83,7 +86,13 @@ public class ParcelableListBinder<T extends Parcelable> extends Binder { 
                mCount = data.readInt();

            }

            while (i < mCount && data.readInt() != END_OF_PARCEL) {

                mList.add(data.readParcelable(null));

                Object object = data.readParcelable(null);

                if (mListElementsClass.isAssignableFrom(object.getClass())) {

                    // Checking list items are of compaitible types to validate against malicious

                    // apps calling it directly via reflection with non compilable items.

                    // See b/317048338 for more details

                    mList.add((T) object);

                }

                i++;

            }

            if (i >= mCount) {

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

+8 −6
Original line number Diff line number Diff line
@@ -1100,7 +1100,9 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR 


        @Override

        public IBinder getBinderForSetQueue() throws RemoteException {

            return new ParcelableListBinder<QueueItem>((list) -> {

            return new ParcelableListBinder<QueueItem>(

                    QueueItem.class,

                    (list) -> {

                        synchronized (mLock) {

                            mQueue = list;

                        }