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

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

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

parents 1793e6c5 f08cb151

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4141,7 +4141,7 @@ package android.content.pm { 
    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_RECENTS = 33554432; // 0x2000000

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

    field 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_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000

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

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

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

     * {@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

     */

    @SystemApi

core/res/res/values/attrs_manifest.xml

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

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

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

             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.

          -->

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

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

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

             recents app. -->