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

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

Merge "[pm] un-deprecate MATCH_CLONE_PROFILE" into main

parents 806af8b7 176af007

core/api/system-current.txt

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

    field @Deprecated public static final int INTENT_FILTER_VERIFICATION_SUCCESS = 1; // 0x1

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

    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_ANY_USER = 4194304; // 0x400000

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

    field 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 @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_FACTORY_ONLY = 2097152; // 0x200000

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

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

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -1225,12 +1225,10 @@ public abstract class PackageManager { 
    public static final int MATCH_DEBUG_TRIAGED_MISSING = MATCH_DIRECT_BOOT_AUTO;

    public static final int MATCH_DEBUG_TRIAGED_MISSING = MATCH_DIRECT_BOOT_AUTO;





    /**

    /**

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

     * Use {@link #MATCH_CLONE_PROFILE_LONG} instead.

     *

     *

     * @hide

     * @hide

     */

     */

    @SuppressLint("UnflaggedApi") // Just adding the @Deprecated annotation

    @Deprecated

    @SystemApi

    @SystemApi

    public static final int MATCH_CLONE_PROFILE = 0x20000000;

    public static final int MATCH_CLONE_PROFILE = 0x20000000;