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

Commit 32e83bd0 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 am: 2b60d838 am: 65149085 am: 8c62197e

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



Change-Id: I53776af3bc659e3264b29d8dd978f09fa8cc4bb8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 57b83ba3 8c62197e

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

+11 −2
Original line number Original line 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 END_OF_PARCEL = 0;

    private static final int ITEM_CONTINUED = 1;

    private static final int ITEM_CONTINUED = 1;





    private final Class<T> mListElementsClass;

    private final Consumer<List<T>> mConsumer;

    private final Consumer<List<T>> mConsumer;





    private final Object mLock = new Object();

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

    /**

     * Creates an instance.

     * Creates an instance.

     *

     *

     * @param listElementsClass the class of the list elements.

     * @param consumer a consumer that consumes the list received

     * @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;

        mConsumer = consumer;

    }

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

                mCount = data.readInt();

            }

            }

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

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

                i++;

            }

            }

            if (i >= mCount) {

            if (i >= mCount) {

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

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




        @Override

        @Override

        public IBinder getBinderForSetQueue() throws RemoteException {

        public IBinder getBinderForSetQueue() throws RemoteException {

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

            return new ParcelableListBinder<QueueItem>(

                    QueueItem.class,

                    (list) -> {

                        synchronized (mLock) {

                        synchronized (mLock) {

                            mQueue = list;

                            mQueue = list;

                        }

                        }