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

Commit b25210f9 authored by Song Chun Fan's avatar Song Chun Fan Committed by Android (Google) Code Review
Browse files

Merge "[pm] deprecate a duplicated flag value" into main

parents d37a3610 b348c96f

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4354,7 +4354,7 @@ package android.content.pm { 
    field @Deprecated public static final int INTENT_FILTER_VERIFICATION_SUCCESS = 1; // 0x1

    field @Deprecated public static final int MASK_PERMISSION_FLAGS = 255; // 0xff

    field public static final int MATCH_ANY_USER = 4194304; // 0x400000

    field public static final int MATCH_CLONE_PROFILE = 536870912; // 0x20000000

    field @Deprecated public static final int MATCH_CLONE_PROFILE = 536870912; // 0x20000000

    field @FlaggedApi("android.content.pm.fix_duplicated_flags") public static final long MATCH_CLONE_PROFILE_LONG = 17179869184L; // 0x400000000L

    field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000

    field public static final int MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS = 536870912; // 0x20000000

core/java/android/content/pm/PackageManager.java

+3 −2
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ public abstract class PackageManager { 
            GET_DISABLED_COMPONENTS,

            GET_DISABLED_UNTIL_USED_COMPONENTS,

            GET_UNINSTALLED_PACKAGES,

            MATCH_CLONE_PROFILE,

            MATCH_CLONE_PROFILE_LONG,

            MATCH_QUARANTINED_COMPONENTS,

    })

    @Retention(RetentionPolicy.SOURCE)
@@ -1235,10 +1235,11 @@ public abstract class PackageManager { 
    public static final int MATCH_DEBUG_TRIAGED_MISSING = MATCH_DIRECT_BOOT_AUTO;



    /**

     * Use {@link #MATCH_CLONE_PROFILE_LONG} instead.

     * @deprecated Use {@link #MATCH_CLONE_PROFILE_LONG} instead.

     *

     * @hide

     */

    @Deprecated

    @SystemApi

    public static final int MATCH_CLONE_PROFILE = 0x20000000;