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

Commit c9b841fb authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-19.1' into v1-s

parents 19392372 0b338a6b

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3324,7 +3324,7 @@ package android.window { 


  public class WindowOrganizer {

    ctor public WindowOrganizer();

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_ACTIVITY_TASKS, conditional=true) public int applySyncTransaction(@NonNull android.window.WindowContainerTransaction, @NonNull android.window.WindowContainerTransactionCallback);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public int applySyncTransaction(@NonNull android.window.WindowContainerTransaction, @NonNull android.window.WindowContainerTransactionCallback);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_ACTIVITY_TASKS, conditional=true) public void applyTransaction(@NonNull android.window.WindowContainerTransaction);

  }

core/java/android/accessibilityservice/AccessibilityService.java

+4 −0
Original line number Diff line number Diff line
@@ -2054,6 +2054,10 @@ public abstract class AccessibilityService extends Service { 
        IAccessibilityServiceConnection connection =

                AccessibilityInteractionClient.getInstance(this).getConnection(mConnectionId);

        if (mInfo != null && connection != null) {

            if (!mInfo.isWithinParcelableSize()) {

                throw new IllegalStateException(

                        "Cannot update service info: size is larger than safe parcelable limits.");

            }

            try {

                connection.setServiceInfo(mInfo);

                mInfo = null;

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+10 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.content.res.XmlResourceParser; 
import android.graphics.drawable.Drawable;

import android.hardware.fingerprint.FingerprintManager;

import android.os.Build;

import android.os.IBinder;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.RemoteException;
@@ -1063,6 +1064,15 @@ public class AccessibilityServiceInfo implements Parcelable { 
        return 0;

    }



    /** @hide */

    public final boolean isWithinParcelableSize() {

        final Parcel parcel = Parcel.obtain();

        writeToParcel(parcel, 0);

        final boolean result = parcel.dataSize() <= IBinder.MAX_IPC_SIZE;

        parcel.recycle();

        return result;

    }



    public void writeToParcel(Parcel parcel, int flagz) {

        parcel.writeInt(eventTypes);

        parcel.writeStringArray(packageNames);

core/java/android/net/Uri.java

+15 −7
Original line number Diff line number Diff line
@@ -1205,13 +1205,16 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { 
        }



        static Uri readFrom(Parcel parcel) {

            return new HierarchicalUri(

                parcel.readString8(),

                Part.readFrom(parcel),

                PathPart.readFrom(parcel),

                Part.readFrom(parcel),

                Part.readFrom(parcel)

            );

            final String scheme = parcel.readString8();

            final Part authority = Part.readFrom(parcel);

            // In RFC3986 the path should be determined based on whether there is a scheme or

            // authority present (https://www.rfc-editor.org/rfc/rfc3986.html#section-3.3).

            final boolean hasSchemeOrAuthority =

                    (scheme != null && scheme.length() > 0) || !authority.isEmpty();

            final PathPart path = PathPart.readFrom(hasSchemeOrAuthority, parcel);

            final Part query = Part.readFrom(parcel);

            final Part fragment = Part.readFrom(parcel);

            return new HierarchicalUri(scheme, authority, path, query, fragment);

        }



        public int describeContents() {
@@ -2270,6 +2273,11 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { 
            }

        }



        static PathPart readFrom(boolean hasSchemeOrAuthority, Parcel parcel) {

            final PathPart path = readFrom(parcel);

            return hasSchemeOrAuthority ? makeAbsolute(path) : path;

        }



        /**

         * Creates a path from the encoded string.

         *

core/java/android/window/TaskFragmentOrganizer.java

+0 −9
Original line number Diff line number Diff line
@@ -157,15 +157,6 @@ public class TaskFragmentOrganizer extends WindowOrganizer { 
        super.applyTransaction(t);

    }



    // Suppress the lint because it is not a registration method.

    @SuppressWarnings("ExecutorRegistration")

    @Override

    public int applySyncTransaction(@NonNull WindowContainerTransaction t,

            @NonNull WindowContainerTransactionCallback callback) {

        t.setTaskFragmentOrganizer(mInterface);

        return super.applySyncTransaction(t, callback);

    }



    private final ITaskFragmentOrganizer mInterface = new ITaskFragmentOrganizer.Stub() {

        @Override

        public void onTaskFragmentAppeared(@NonNull TaskFragmentInfo taskFragmentInfo) {