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

Commit 47b8faf7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [12820899, 12820921, 12820267, 12820924, 12820699,... 

Merge cherrypicks of [12820899, 12820921, 12820267, 12820924, 12820699, 12820781, 12821235, 12821236, 12820925, 12821237, 12820545, 12821039, 12820926, 12820927, 12820928, 12820929, 12820930, 12820590, 12820471, 12820591, 12820592, 12820593, 12820594, 12821255, 12821256, 12821257, 12820998, 12820932, 12821258, 12820546, 12820933, 12820934, 12820547, 12820548, 12821275, 12821238, 12821239, 12821240, 12821241, 12821199, 12821276, 12821277, 12821278, 12821279, 12821280] into rvc-qpr1-release

Change-Id: I4a6407456ea03c0fa5a810bf57b7465cf06c9513
parents 2ed2c83c a37060db

cmds/incidentd/src/IncidentService.cpp

+4 −0
Original line number Diff line number Diff line
@@ -554,6 +554,10 @@ status_t IncidentService::command(FILE* in, FILE* out, FILE* err, Vector<String8 
            return NO_ERROR;

        }

        if (!args[0].compare(String8("section"))) {

            if (argCount == 1) {

                fprintf(out, "Not enough arguments for section\n");

                return NO_ERROR;

            }

            int id = atoi(args[1]);

            int idx = 0;

            while (SECTION_LIST[idx] != NULL) {

core/java/android/app/ActivityView.java

+13 −2
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd 
    public ActivityView(

            @NonNull Context context, @NonNull AttributeSet attrs, int defStyle,

            boolean singleTaskInstance, boolean usePublicVirtualDisplay) {

        this(context, attrs, defStyle, singleTaskInstance, usePublicVirtualDisplay, false);

        this(context, attrs, defStyle, singleTaskInstance, usePublicVirtualDisplay,

                false /* disableSurfaceViewBackgroundLayer */);

    }



    /** @hide */
@@ -113,12 +114,22 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd 
            @NonNull Context context, @NonNull AttributeSet attrs, int defStyle,

            boolean singleTaskInstance, boolean usePublicVirtualDisplay,

            boolean disableSurfaceViewBackgroundLayer) {

        this(context, attrs, defStyle, singleTaskInstance, usePublicVirtualDisplay,

                disableSurfaceViewBackgroundLayer, false /* useTrustedDisplay */);

    }



    // TODO(b/162901735): Refactor ActivityView with Builder

    /** @hide */

    public ActivityView(

            @NonNull Context context, @NonNull AttributeSet attrs, int defStyle,

            boolean singleTaskInstance, boolean usePublicVirtualDisplay,

            boolean disableSurfaceViewBackgroundLayer, boolean useTrustedDisplay) {

        super(context, attrs, defStyle);

        if (useTaskOrganizer()) {

            mTaskEmbedder = new TaskOrganizerTaskEmbedder(context, this);

        } else {

            mTaskEmbedder = new VirtualDisplayTaskEmbedder(context, this, singleTaskInstance,

                    usePublicVirtualDisplay);

                    usePublicVirtualDisplay, useTrustedDisplay);

        }

        mSurfaceView = new SurfaceView(context, null, 0, 0, disableSurfaceViewBackgroundLayer);

        // Since ActivityView#getAlpha has been overridden, we should use parent class's alpha

core/java/android/provider/DocumentsProvider.java

+30 −12
Original line number Diff line number Diff line
@@ -218,8 +218,15 @@ public abstract class DocumentsProvider extends ContentProvider { 
    }



    /** {@hide} */

    private void enforceTree(Uri documentUri) {

        if (isTreeUri(documentUri)) {

    private void enforceTreeForExtraUris(Bundle extras) {

        enforceTree(extras.getParcelable(DocumentsContract.EXTRA_URI));

        enforceTree(extras.getParcelable(DocumentsContract.EXTRA_PARENT_URI));

        enforceTree(extras.getParcelable(DocumentsContract.EXTRA_TARGET_URI));

    }



    /** {@hide} */

    private void enforceTree(@Nullable Uri documentUri) {

        if (documentUri != null && isTreeUri(documentUri)) {

            final String parent = getTreeDocumentId(documentUri);

            final String child = getDocumentId(documentUri);

            if (Objects.equals(parent, child)) {
@@ -232,6 +239,10 @@ public abstract class DocumentsProvider extends ContentProvider { 
        }

    }



    private Uri validateIncomingNullableUri(@Nullable Uri uri) {

        return uri == null ? null : validateIncomingUri(uri);

    }



    /**

     * Create a new document and return its newly generated

     * {@link Document#COLUMN_DOCUMENT_ID}. You must allocate a new
@@ -1076,11 +1087,21 @@ public abstract class DocumentsProvider extends ContentProvider { 
        final Context context = getContext();

        final Bundle out = new Bundle();



        // If the URI is a tree URI performs some validation.

        enforceTreeForExtraUris(extras);



        final Uri extraUri = validateIncomingNullableUri(

                extras.getParcelable(DocumentsContract.EXTRA_URI));

        final Uri extraTargetUri = validateIncomingNullableUri(

                extras.getParcelable(DocumentsContract.EXTRA_TARGET_URI));

        final Uri extraParentUri = validateIncomingNullableUri(

                extras.getParcelable(DocumentsContract.EXTRA_PARENT_URI));



        if (METHOD_EJECT_ROOT.equals(method)) {

            // Given that certain system apps can hold MOUNT_UNMOUNT permission, but only apps

            // signed with platform signature can hold MANAGE_DOCUMENTS, we are going to check for

            // MANAGE_DOCUMENTS or associated URI permission here instead

            final Uri rootUri = extras.getParcelable(DocumentsContract.EXTRA_URI);

            final Uri rootUri = extraUri;

            enforceWritePermissionInner(rootUri, getCallingPackage(), getCallingAttributionTag(),

                    null);
@@ -1090,7 +1111,7 @@ public abstract class DocumentsProvider extends ContentProvider { 
            return out;

        }



        final Uri documentUri = extras.getParcelable(DocumentsContract.EXTRA_URI);

        final Uri documentUri = extraUri;

        final String authority = documentUri.getAuthority();

        final String documentId = DocumentsContract.getDocumentId(documentUri);
@@ -1099,14 +1120,11 @@ public abstract class DocumentsProvider extends ContentProvider { 
                    "Requested authority " + authority + " doesn't match provider " + mAuthority);

        }



        // If the URI is a tree URI performs some validation.

        enforceTree(documentUri);



        if (METHOD_IS_CHILD_DOCUMENT.equals(method)) {

            enforceReadPermissionInner(documentUri, getCallingPackage(),

                    getCallingAttributionTag(), null);



            final Uri childUri = extras.getParcelable(DocumentsContract.EXTRA_TARGET_URI);

            final Uri childUri = extraTargetUri;

            final String childAuthority = childUri.getAuthority();

            final String childId = DocumentsContract.getDocumentId(childUri);
@@ -1173,7 +1191,7 @@ public abstract class DocumentsProvider extends ContentProvider { 
            revokeDocumentPermission(documentId);



        } else if (METHOD_COPY_DOCUMENT.equals(method)) {

            final Uri targetUri = extras.getParcelable(DocumentsContract.EXTRA_TARGET_URI);

            final Uri targetUri = extraTargetUri;

            final String targetId = DocumentsContract.getDocumentId(targetUri);



            enforceReadPermissionInner(documentUri, getCallingPackage(),
@@ -1197,9 +1215,9 @@ public abstract class DocumentsProvider extends ContentProvider { 
            }



        } else if (METHOD_MOVE_DOCUMENT.equals(method)) {

            final Uri parentSourceUri = extras.getParcelable(DocumentsContract.EXTRA_PARENT_URI);

            final Uri parentSourceUri = extraParentUri;

            final String parentSourceId = DocumentsContract.getDocumentId(parentSourceUri);

            final Uri targetUri = extras.getParcelable(DocumentsContract.EXTRA_TARGET_URI);

            final Uri targetUri = extraTargetUri;

            final String targetId = DocumentsContract.getDocumentId(targetUri);



            enforceWritePermissionInner(documentUri, getCallingPackage(),
@@ -1225,7 +1243,7 @@ public abstract class DocumentsProvider extends ContentProvider { 
            }



        } else if (METHOD_REMOVE_DOCUMENT.equals(method)) {

            final Uri parentSourceUri = extras.getParcelable(DocumentsContract.EXTRA_PARENT_URI);

            final Uri parentSourceUri = extraParentUri;

            final String parentSourceId = DocumentsContract.getDocumentId(parentSourceUri);



            enforceReadPermissionInner(parentSourceUri, getCallingPackage(),

core/java/android/window/VirtualDisplayTaskEmbedder.java

+8 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.window; 
import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL;

import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY;

import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC;

import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_TRUSTED;

import static android.view.Display.INVALID_DISPLAY;



import android.app.ActivityManager;
@@ -63,6 +64,7 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder { 
    private int mDisplayDensityDpi;

    private final boolean mSingleTaskInstance;

    private final boolean mUsePublicVirtualDisplay;

    private final boolean mUseTrustedDisplay;

    private VirtualDisplay mVirtualDisplay;

    private Insets mForwardedInsets;

    private DisplayMetrics mTmpDisplayMetrics;
@@ -77,10 +79,12 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder { 
     *                           only applicable if virtual displays are used

     */

    public VirtualDisplayTaskEmbedder(Context context, VirtualDisplayTaskEmbedder.Host host,

            boolean singleTaskInstance, boolean usePublicVirtualDisplay) {

            boolean singleTaskInstance, boolean usePublicVirtualDisplay,

            boolean useTrustedDisplay) {

        super(context, host);

        mSingleTaskInstance = singleTaskInstance;

        mUsePublicVirtualDisplay = usePublicVirtualDisplay;

        mUseTrustedDisplay = useTrustedDisplay;

    }



    /**
@@ -103,6 +107,9 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder { 
        if (mUsePublicVirtualDisplay) {

            virtualDisplayFlags |= VIRTUAL_DISPLAY_FLAG_PUBLIC;

        }

        if (mUseTrustedDisplay) {

            virtualDisplayFlags |= VIRTUAL_DISPLAY_FLAG_TRUSTED;

        }



        mVirtualDisplay = displayManager.createVirtualDisplay(

                DISPLAY_NAME + "@" + System.identityHashCode(this), mHost.getWidth(),

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ 
    <protected-broadcast android:name="android.bluetooth.adapter.action.CONNECTION_STATE_CHANGED" />

    <protected-broadcast android:name="android.bluetooth.device.action.UUID" />

    <protected-broadcast android:name="android.bluetooth.device.action.MAS_INSTANCE" />

    <protected-broadcast android:name="android.bluetooth.action.ALIAS_CHANGED" />

    <protected-broadcast android:name="android.bluetooth.device.action.ALIAS_CHANGED" />

    <protected-broadcast android:name="android.bluetooth.device.action.FOUND" />

    <protected-broadcast android:name="android.bluetooth.device.action.CLASS_CHANGED" />

    <protected-broadcast android:name="android.bluetooth.device.action.ACL_CONNECTED" />