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

Commit 20e88667 authored by Hai Zhang's avatar Hai Zhang Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Deprecate retailDemo permission protection flag."" into main

parents e54bdfb4 603839e3

core/api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -4386,7 +4386,7 @@ package android.content.pm { 
    field public static final int PROTECTION_FLAG_MODULE = 4194304; // 0x400000

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

    field public static final int PROTECTION_FLAG_OEM = 16384; // 0x4000

    field public static final int PROTECTION_FLAG_OEM = 16384; // 0x4000

    field public static final int PROTECTION_FLAG_RECENTS = 33554432; // 0x2000000

    field public static final int PROTECTION_FLAG_RECENTS = 33554432; // 0x2000000

    field public static final int PROTECTION_FLAG_RETAIL_DEMO = 16777216; // 0x1000000

    field @Deprecated public static final int PROTECTION_FLAG_RETAIL_DEMO = 16777216; // 0x1000000

    field public static final int PROTECTION_FLAG_ROLE = 67108864; // 0x4000000

    field public static final int PROTECTION_FLAG_ROLE = 67108864; // 0x4000000

    field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000

    field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000

    field public static final int PROTECTION_FLAG_VENDOR_PRIVILEGED = 32768; // 0x8000

    field public static final int PROTECTION_FLAG_VENDOR_PRIVILEGED = 32768; // 0x8000

core/java/android/content/pm/PermissionInfo.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -273,6 +273,9 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
     * to the <code>retailDemo</code> value of

     * to the <code>retailDemo</code> value of

     * {@link android.R.attr#protectionLevel}.

     * {@link android.R.attr#protectionLevel}.

     *

     *

     * @deprecated This flag has been replaced by the retail demo role and is a no-op since Android

     *             V.

     *

     * @hide

     * @hide

     */

     */

    @SystemApi

    @SystemApi

core/res/res/values/attrs_manifest.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -301,7 +301,9 @@ 
            granted to the system companion device manager service -->

            granted to the system companion device manager service -->

        <flag name="companion" value="0x800000" />

        <flag name="companion" value="0x800000" />

        <!-- Additional flag from base permission type: this permission will be granted to the

        <!-- Additional flag from base permission type: this permission will be granted to the

             retail demo app, as defined by the OEM. -->

             retail demo app, as defined by the OEM.

             This flag has been replaced by the retail demo role and is a no-op since Android V.

          -->

        <flag name="retailDemo" value="0x1000000" />

        <flag name="retailDemo" value="0x1000000" />

        <!-- Additional flag from base permission type: this permission will be granted to the

        <!-- Additional flag from base permission type: this permission will be granted to the

             recents app. -->

             recents app. -->