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

Commit 8ed02047 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #123704875: Editing the screenshot force closed the activity"

parents 9d4dcfb7 52e42a40

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -645,6 +645,7 @@ package android { 
    field public static final int footerDividersEnabled = 16843311; // 0x101022f

    field public static final int forceDarkAllowed = 16844172; // 0x101058c

    field public static final int forceHasOverlappingRendering = 16844065; // 0x1010521

    field public static final int forceUriPermissions = 16844197; // 0x10105a5

    field public static final int foreground = 16843017; // 0x1010109

    field public static final int foregroundGravity = 16843264; // 0x1010200

    field public static final int foregroundServiceType = 16844191; // 0x101059f
@@ -11874,6 +11875,7 @@ package android.content.pm { 
    field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000

    field public String authority;

    field public int flags;

    field public boolean forceUriPermissions;

    field public boolean grantUriPermissions;

    field public int initOrder;

    field @Deprecated public boolean isSyncable;

core/java/android/content/pm/PackageParser.java

+4 −0
Original line number Diff line number Diff line
@@ -5260,6 +5260,10 @@ public class PackageParser { 
                com.android.internal.R.styleable.AndroidManifestProvider_grantUriPermissions,

                false);



        p.info.forceUriPermissions = sa.getBoolean(

                com.android.internal.R.styleable.AndroidManifestProvider_forceUriPermissions,

                false);



        p.info.multiprocess = sa.getBoolean(

                com.android.internal.R.styleable.AndroidManifestProvider_multiprocess,

                false);

core/java/android/content/pm/ProviderInfo.java

+10 −1
Original line number Diff line number Diff line
@@ -48,6 +48,12 @@ public final class ProviderInfo extends ComponentInfo 
     */

    public boolean grantUriPermissions = false;



    /** If true, always apply URI permission grants, as per the

     * {@link android.R.styleable#AndroidManifestProvider_forceUriPermissions

     * forceUriPermissions} attribute.

     */

    public boolean forceUriPermissions = false;



    /**

     * If non-null, these are the patterns that are allowed for granting URI

     * permissions.  Any URI that does not match one of these patterns will not
@@ -112,6 +118,7 @@ public final class ProviderInfo extends ComponentInfo 
        readPermission = orig.readPermission;

        writePermission = orig.writePermission;

        grantUriPermissions = orig.grantUriPermissions;

        forceUriPermissions = orig.forceUriPermissions;

        uriPermissionPatterns = orig.uriPermissionPatterns;

        pathPermissions = orig.pathPermissions;

        multiprocess = orig.multiprocess;
@@ -142,6 +149,7 @@ public final class ProviderInfo extends ComponentInfo 
        out.writeString(readPermission);

        out.writeString(writePermission);

        out.writeInt(grantUriPermissions ? 1 : 0);

        out.writeInt(forceUriPermissions ? 1 : 0);

        out.writeTypedArray(uriPermissionPatterns, parcelableFlags);

        out.writeTypedArray(pathPermissions, parcelableFlags);

        out.writeInt(multiprocess ? 1 : 0);
@@ -171,6 +179,7 @@ public final class ProviderInfo extends ComponentInfo 
        readPermission = in.readString();

        writePermission = in.readString();

        grantUriPermissions = in.readInt() != 0;

        forceUriPermissions = in.readInt() != 0;

        uriPermissionPatterns = in.createTypedArray(PatternMatcher.CREATOR);

        pathPermissions = in.createTypedArray(PathPermission.CREATOR);

        multiprocess = in.readInt() != 0;

core/res/res/values/attrs_manifest.xml

+10 −0
Original line number Diff line number Diff line
@@ -164,6 +164,15 @@ 
         provider.-->

    <attr name="grantUriPermissions" format="boolean" />



    <!-- If true, the system will always create URI permission grants

         in the cases where {@link android.content.Intent#FLAG_GRANT_READ_URI_PERMISSION}

         or {@link android.content.Intent#FLAG_GRANT_WRITE_URI_PERMISSION} would apply.

         This is useful for a content provider that dynamically enforces permissions

         on calls in to the provider, instead of through the manifest: the system

         needs to know that it should always apply permission grants, even if it

         looks like the target of the grant would already have access to the URI. -->

    <attr name="forceUriPermissions" format="boolean" />



    <!-- Characterizes the potential risk implied in a permission and

         indicates the procedure the system should follow when determining

         whether to grant the permission to an application requesting it. {@link
@@ -2199,6 +2208,7 @@ 
        <attr name="readPermission" />

        <attr name="writePermission" />

        <attr name="grantUriPermissions" />

        <attr name="forceUriPermissions" />

        <attr name="permission" />

        <attr name="multiprocess" />

        <attr name="initOrder" />

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -2938,6 +2938,7 @@ 
        <public name="inheritShowWhenLocked" />

        <public name="zygotePreloadName" />

        <public name="useEmbeddedDex" />

        <public name="forceUriPermissions" />

    </public-group>



    <public-group type="drawable" first-id="0x010800b4">