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

Commit b153c4dd authored by Eugene Susla's avatar Eugene Susla Committed by Automerger Merge Worker
Browse files

Merge "Rename auto-revoke manifest flags to not contain "Dont"" into rvc-dev am: 733a81b9 

Change-Id: I1b9797ca5bc7f335076908d3d838d2c5910fb493
parents 823c7a3c 733a81b9

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -288,9 +288,9 @@ package android { 
    field public static final int alignmentMode = 16843642; // 0x101037a

    field public static final int allContactsName = 16843468; // 0x10102cc

    field public static final int allowAudioPlaybackCapture = 16844289; // 0x1010601

    field public static final int allowAutoRevokePermissionsExemption = 16844309; // 0x1010615

    field public static final int allowBackup = 16843392; // 0x1010280

    field public static final int allowClearUserData = 16842757; // 0x1010005

    field public static final int allowDontAutoRevokePermissions = 16844309; // 0x1010615

    field public static final int allowEmbedded = 16843765; // 0x10103f5

    field public static final int allowNativeHeapPointerTagging = 16844307; // 0x1010613

    field public static final int allowParallelSyncs = 16843570; // 0x1010332
@@ -1140,7 +1140,7 @@ package android { 
    field public static final int reqKeyboardType = 16843304; // 0x1010228

    field public static final int reqNavigation = 16843306; // 0x101022a

    field public static final int reqTouchScreen = 16843303; // 0x1010227

    field public static final int requestDontAutoRevokePermissions = 16844308; // 0x1010614

    field public static final int requestAutoRevokePermissionsExemption = 16844308; // 0x1010614

    field public static final int requestLegacyExternalStorage = 16844291; // 0x1010603

    field public static final int requireDeviceUnlock = 16843756; // 0x10103ec

    field public static final int required = 16843406; // 0x101028e

core/java/android/content/pm/parsing/ParsingPackageUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -1820,8 +1820,8 @@ public class ParsingPackageUtils { 
                .setUseEmbeddedDex(bool(false, R.styleable.AndroidManifestApplication_useEmbeddedDex, sa))

                .setUsesNonSdkApi(bool(false, R.styleable.AndroidManifestApplication_usesNonSdkApi, sa))

                .setVmSafeMode(bool(false, R.styleable.AndroidManifestApplication_vmSafeMode, sa))

                .setDontAutoRevokePermissions(bool(false, R.styleable.AndroidManifestApplication_requestDontAutoRevokePermissions, sa))

                .setAllowDontAutoRevokePermissions(bool(false, R.styleable.AndroidManifestApplication_allowDontAutoRevokePermissions, sa))

                .setDontAutoRevokePermissions(bool(false, R.styleable.AndroidManifestApplication_requestAutoRevokePermissionsExemption, sa))

                .setAllowDontAutoRevokePermissions(bool(false, R.styleable.AndroidManifestApplication_allowAutoRevokePermissionsExemption, sa))

                // targetSdkVersion gated

                .setAllowAudioPlaybackCapture(bool(targetSdk >= Build.VERSION_CODES.Q, R.styleable.AndroidManifestApplication_allowAudioPlaybackCapture, sa))

                .setBaseHardwareAccelerated(bool(targetSdk >= Build.VERSION_CODES.ICE_CREAM_SANDWICH, R.styleable.AndroidManifestApplication_hardwareAccelerated, sa))

core/res/res/values/attrs_manifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -1832,7 +1832,7 @@ 
             revoked when the app is unused for an extended amount of time.



             The default value is {@code false}. -->

        <attr name="requestDontAutoRevokePermissions" format="boolean" />

        <attr name="requestAutoRevokePermissionsExemption" format="boolean" />



        <!-- If {@code true} its permissions shouldn't get automatically

             revoked when the app is unused for an extended amount of time.
@@ -1840,7 +1840,7 @@ 
             This implies {@code requestDontAutoRevokePermissions=true}



             The default value is {@code false}. -->

        <attr name="allowDontAutoRevokePermissions" format="boolean" />

        <attr name="allowAutoRevokePermissionsExemption" format="boolean" />

    </declare-styleable>



    <!-- An attribution is a logical part of an app and is identified by a tag.

core/res/res/values/public.xml

+2 −2
Original line number Diff line number Diff line
@@ -3014,8 +3014,8 @@ 
      <!-- @hide @SystemApi -->

      <public name="minExtensionVersion" />

      <public name="allowNativeHeapPointerTagging" />

      <public name="requestDontAutoRevokePermissions" />

      <public name="allowDontAutoRevokePermissions" />

      <public name="requestAutoRevokePermissionsExemption" />

      <public name="allowAutoRevokePermissionsExemption" />

      <public name="preserveLegacyExternalStorage" />

      <public name="mimeGroup" />

      <public name="enableGwpAsan" />