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

Commit e6fb3968 authored by Michael Wright's avatar Michael Wright
Browse files

Fix XML flag names. 

Some flags defined as a string in the XML files didn't match the
corresponding flag name from the aconfig. Fix them up to match so they
actually get recognized when finalizing the SDK.

Bug: 335454564
Test: presubmit
Change-Id: Id108878c44eec0ddb104d494bc63362aaff49fc1
parent 86d6ae67

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ package android { 
    field public static final int autoSizeTextType = 16844085; // 0x1010535

    field public static final int autoStart = 16843445; // 0x10102b5

    field @Deprecated public static final int autoText = 16843114; // 0x101016a

    field @FlaggedApi("android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP") public static final int autoTransact;

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final int autoTransact;

    field public static final int autoUrlDetect = 16843404; // 0x101028c

    field public static final int autoVerify = 16844014; // 0x10104ee

    field public static final int autofillHints = 16844118; // 0x1010556
@@ -1499,7 +1499,7 @@ package android { 
    field public static final int shortcutId = 16844072; // 0x1010528

    field public static final int shortcutLongLabel = 16844074; // 0x101052a

    field public static final int shortcutShortLabel = 16844073; // 0x1010529

    field @FlaggedApi("android.nfc.Flags.FLAG_OBSERVE_MODE") public static final int shouldDefaultToObserveMode;

    field @FlaggedApi("android.nfc.nfc_observe_mode") public static final int shouldDefaultToObserveMode;

    field public static final int shouldDisableView = 16843246; // 0x10101ee

    field public static final int shouldUseDefaultUnfoldTransition = 16844364; // 0x101064c

    field public static final int showAsAction = 16843481; // 0x10102d9

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ package android { 
    field public static final String ACCESS_DRM_CERTIFICATES = "android.permission.ACCESS_DRM_CERTIFICATES";

    field @Deprecated public static final String ACCESS_FM_RADIO = "android.permission.ACCESS_FM_RADIO";

    field public static final String ACCESS_FPS_COUNTER = "android.permission.ACCESS_FPS_COUNTER";

    field @FlaggedApi("android.multiuser.flags.enable_permission_to_access_hidden_profiles") public static final String ACCESS_HIDDEN_PROFILES_FULL = "android.permission.ACCESS_HIDDEN_PROFILES_FULL";

    field @FlaggedApi("android.multiuser.enable_permission_to_access_hidden_profiles") public static final String ACCESS_HIDDEN_PROFILES_FULL = "android.permission.ACCESS_HIDDEN_PROFILES_FULL";

    field public static final String ACCESS_INSTANT_APPS = "android.permission.ACCESS_INSTANT_APPS";

    field @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public static final String ACCESS_LAST_KNOWN_CELL_ID = "android.permission.ACCESS_LAST_KNOWN_CELL_ID";

    field public static final String ACCESS_LOCUS_ID_USAGE_STATS = "android.permission.ACCESS_LOCUS_ID_USAGE_STATS";

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -3250,7 +3250,7 @@ 


    <!-- @SystemApi @hide Allows privileged applications to get details about hidden profile

        users.

        @FlaggedApi("android.multiuser.flags.enable_permission_to_access_hidden_profiles") -->

        @FlaggedApi("android.multiuser.enable_permission_to_access_hidden_profiles") -->

    <permission

        android:name="android.permission.ACCESS_HIDDEN_PROFILES_FULL"

        android:protectionLevel="signature|privileged" />

core/res/res/values/attrs.xml

+4 −4
Original line number Diff line number Diff line
@@ -4479,20 +4479,20 @@ 
    <!-- Specify one or more <code>polling-loop-filter</code> elements inside a

         <code>host-apdu-service</code> to indicate polling loop frames that

         your service can handle. -->

    <!-- @FlaggedApi("android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP") -->

    <!-- @FlaggedApi("android.nfc.nfc_read_polling_loop") -->

    <declare-styleable name="PollingLoopFilter">

        <!-- The polling loop frame. This attribute is mandatory. -->

        <attr name="name" />

        <!-- Whether or not the system should automatically start a transaction when this polling

         loop filter matches. If not set, default value is false. -->

        <!-- @FlaggedApi("android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP") -->

        <!-- @FlaggedApi("android.nfc.nfc_read_polling_loop") -->

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

    </declare-styleable>















    <!-- Specify one or more <code>polling-loop-pattern-filter</code> elements inside a















         <code>host-apdu-service</code> to indicate polling loop frames that















         your service can handle. -->













    <!-- @FlaggedApi("android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP") -->













    <!-- @FlaggedApi("android.nfc.nfc_read_polling_loop") -->















    <declare-styleable name="PollingLoopPatternFilter">















        <!-- The patter to match polling loop frames to, must to be compatible with















         {@link java.util.regex.Pattern#compile(String)} and only contain hexadecimal numbers and









@@ -4500,7 +4500,7 @@













        <attr name="name" />















        <!-- Whether or not the system should automatically start a transaction when this polling















         loop filter matches. If not set, default value is false. -->













        <!-- @FlaggedApi("android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP") -->













        <!-- @FlaggedApi("android.nfc.nfc_read_polling_loop") -->















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















    </declare-styleable>















































core/res/res/values/public-staging.xml



+2
−2




























Original line number
Diff line number
Diff line








@@ -145,7 +145,7 @@













    <public name="fragmentSuffix"/>















    <!-- @FlaggedApi("com.android.text.flags.use_bounds_for_width") -->















    <public name="useBoundsForWidth"/>













    <!-- @FlaggedApi("android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP") -->













    <!-- @FlaggedApi("android.nfc.nfc_read_polling_loop") -->















    <public name="autoTransact"/>















    <!-- @FlaggedApi("com.android.window.flags.enforce_edge_to_edge") -->















    <public name="windowOptOutEdgeToEdgeEnforcement"/>









@@ -159,7 +159,7 @@













    <public name="contentSensitivity" />















    <!-- @FlaggedApi("android.view.inputmethod.connectionless_handwriting") -->















    <public name="supportsConnectionlessStylusHandwriting" />













    <!-- @FlaggedApi("android.nfc.Flags.FLAG_OBSERVE_MODE") -->













    <!-- @FlaggedApi("android.nfc.nfc_observe_mode") -->















    <public name="shouldDefaultToObserveMode"/>















    <!-- @FlaggedApi("android.security.asm_restrictions_enabled") -->















    <public name="allowCrossUidActivitySwitchFromBelow"/>