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

Commit e0bbc276 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "RRO: Flag ApplicationInfo if it's an RRO"

parents be1d460a 946e32f3

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11051,6 +11051,7 @@ package android.content.pm { 
    method public void dump(android.util.Printer, String);

    method public static CharSequence getCategoryTitle(android.content.Context, int);

    method public boolean isProfileableByShell();

    method public boolean isResourceOverlay();

    method public boolean isVirtualPreload();

    method public CharSequence loadDescription(android.content.pm.PackageManager);

    field public static final int CATEGORY_AUDIO = 1; // 0x1

core/java/android/content/pm/ApplicationInfo.java

+17 −0
Original line number Diff line number Diff line
@@ -671,6 +671,14 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     */

    public static final int PRIVATE_FLAG_ALLOW_AUDIO_PLAYBACK_CAPTURE  = 1 << 27;



    /**

     * Indicates whether this package is in fact a runtime resource overlay.

     *

     * @hide

     */

    public static final int PRIVATE_FLAG_IS_RESOURCE_OVERLAY = 1 << 28;





    /** @hide */

    @IntDef(flag = true, prefix = { "PRIVATE_FLAG_" }, value = {

            PRIVATE_FLAG_ACTIVITIES_RESIZE_MODE_RESIZEABLE,
@@ -683,6 +691,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
            PRIVATE_FLAG_HAS_DOMAIN_URLS,

            PRIVATE_FLAG_HIDDEN,

            PRIVATE_FLAG_INSTANT,

            PRIVATE_FLAG_IS_RESOURCE_OVERLAY,

            PRIVATE_FLAG_ISOLATED_SPLIT_LOADING,

            PRIVATE_FLAG_OEM,

            PRIVATE_FLAG_PARTIALLY_DIRECT_BOOT_AWARE,
@@ -2022,6 +2031,14 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        return (privateFlags & ApplicationInfo.PRIVATE_FLAG_ISOLATED_SPLIT_LOADING) != 0;

    }



    /**

     * Returns true if the package has declared in its manifest that it is a

     * runtime resource overlay.

     */

    public boolean isResourceOverlay() {

        return (privateFlags & ApplicationInfo.PRIVATE_FLAG_IS_RESOURCE_OVERLAY) != 0;

    }



    /**

     * @hide

     */

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

+3 −0
Original line number Diff line number Diff line
@@ -2108,6 +2108,9 @@ public class PackageParser { 
                    return null;

                }



                pkg.applicationInfo.privateFlags |=

                    ApplicationInfo.PRIVATE_FLAG_IS_RESOURCE_OVERLAY;



                XmlUtils.skipCurrentTag(parser);



            } else if (tagName.equals(TAG_KEY_SETS)) {