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

Commit eac49dc8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Re-introduce dummy autoRevok manifest attr as padding" into rvc-dev

parents de4cf918 c5a50213

api/current.txt

+5 −5
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ package android { 
    field public static final int activityCloseExitAnimation = 16842939; // 0x10100bb

    field public static final int activityOpenEnterAnimation = 16842936; // 0x10100b8

    field public static final int activityOpenExitAnimation = 16842937; // 0x10100b9

    field public static final int actor = 16844312; // 0x1010618

    field public static final int actor = 16844313; // 0x1010619

    field public static final int addPrintersActivity = 16843750; // 0x10103e6

    field public static final int addStatesFromChildren = 16842992; // 0x10100f0

    field public static final int adjustViewBounds = 16843038; // 0x101011e
@@ -327,7 +327,7 @@ package android { 
    field public static final int autoLink = 16842928; // 0x10100b0

    field public static final int autoMirrored = 16843754; // 0x10103ea

    field public static final int autoRemoveFromRecents = 16843847; // 0x1010447

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

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

    field public static final int autoSizeMaxTextSize = 16844102; // 0x1010546

    field public static final int autoSizeMinTextSize = 16844088; // 0x1010538

    field public static final int autoSizePresetSizes = 16844087; // 0x1010537
@@ -709,7 +709,7 @@ package android { 
    field public static final int gravity = 16842927; // 0x10100af

    field public static final int gridViewStyle = 16842865; // 0x1010071

    field public static final int groupIndicator = 16843019; // 0x101010b

    field public static final int gwpAsanMode = 16844311; // 0x1010617

    field public static final int gwpAsanMode = 16844312; // 0x1010618

    field public static final int hand_hour = 16843011; // 0x1010103

    field public static final int hand_minute = 16843012; // 0x1010104

    field public static final int handle = 16843354; // 0x101025a
@@ -954,7 +954,7 @@ package android { 
    field public static final int mediaRouteButtonStyle = 16843693; // 0x10103ad

    field public static final int mediaRouteTypes = 16843694; // 0x10103ae

    field public static final int menuCategory = 16843230; // 0x10101de

    field public static final int mimeGroup = 16844310; // 0x1010616

    field public static final int mimeGroup = 16844311; // 0x1010617

    field public static final int mimeType = 16842790; // 0x1010026

    field public static final int min = 16844089; // 0x1010539

    field public static final int minAspectRatio = 16844187; // 0x101059b
@@ -1083,7 +1083,7 @@ package android { 
    field public static final int preferenceScreenStyle = 16842891; // 0x101008b

    field public static final int preferenceStyle = 16842894; // 0x101008e

    field public static final int presentationTheme = 16843712; // 0x10103c0

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

    field public static final int preserveLegacyExternalStorage = 16844310; // 0x1010616

    field public static final int previewImage = 16843482; // 0x10102da

    field public static final int primaryContentAlpha = 16844114; // 0x1010552

    field public static final int priority = 16842780; // 0x101001c

core/res/res/values/attrs_manifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -1827,6 +1827,9 @@ 


        <attr name="gwpAsanMode" />



        <!-- @hide no longer used, kept to preserve padding -->

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



        <attr name="autoRevokePermissions">

            <enum name="allowed" value="0" />

            <enum name="discouraged" value="1" />

core/res/res/values/public.xml

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

      <public name="minExtensionVersion" />

      <public name="allowNativeHeapPointerTagging" />

      <!-- @hide no longer used, kept to preserve padding -->

      <public name="allowAutoRevokePermissionsExemption"/>

      <public name="autoRevokePermissions" />

      <public name="preserveLegacyExternalStorage" />

      <public name="mimeGroup" />