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

Commit 50201ffc authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Android (Google) Code Review
Browse files

Merge "Guard minSdkVersionFull attribute with android.sdk.major_minor_versioning_scheme" into main

parents 982757d4 4d94fca5

core/api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -1203,7 +1203,7 @@ package android { 
    field public static final int minResizeHeight = 16843670; // 0x1010396

    field public static final int minResizeHeight = 16843670; // 0x1010396

    field public static final int minResizeWidth = 16843669; // 0x1010395

    field public static final int minResizeWidth = 16843669; // 0x1010395

    field public static final int minSdkVersion = 16843276; // 0x101020c

    field public static final int minSdkVersion = 16843276; // 0x101020c

    field @FlaggedApi("android.content.pm.support_minor_versions_in_minsdkversion") public static final int minSdkVersionFull;

    field @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static final int minSdkVersionFull;

    field public static final int minWidth = 16843071; // 0x101013f

    field public static final int minWidth = 16843071; // 0x101013f

    field public static final int minimumHorizontalAngle = 16843901; // 0x101047d

    field public static final int minimumHorizontalAngle = 16843901; // 0x101047d

    field public static final int minimumVerticalAngle = 16843902; // 0x101047e

    field public static final int minimumVerticalAngle = 16843902; // 0x101047e

core/res/res/values/attrs_manifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -2572,7 +2572,7 @@ 
             against a development branch, in which case it will only work against

             against a development branch, in which case it will only work against

             the development builds. -->

             the development builds. -->

        <attr name="minSdkVersion" format="integer|string" />

        <attr name="minSdkVersion" format="integer|string" />

        <!-- @FlaggedApi(android.content.pm.Flags.FLAG_SUPPORT_MINOR_VERSIONS_IN_MINSDKVERSION) -->

        <!-- @FlaggedApi(android.sdk.Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME) -->

        <attr name="minSdkVersionFull" format="string" />

        <attr name="minSdkVersionFull" format="string" />

        <!-- This is the SDK version number that the application is targeting.

        <!-- This is the SDK version number that the application is targeting.

             It is able to run on older versions (down to minSdkVersion), but

             It is able to run on older versions (down to minSdkVersion), but

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -135,7 +135,7 @@ 
    <public name="pageSizeCompat" />

    <public name="pageSizeCompat" />

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

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

    <public name="shareRolePriority"/>

    <public name="shareRolePriority"/>

    <!-- @FlaggedApi(android.content.pm.Flags.FLAG_SUPPORT_MINOR_VERSIONS_IN_MINSDKVERSION) -->

    <!-- @FlaggedApi(android.sdk.Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME) -->

    <public name="minSdkVersionFull"/>

    <public name="minSdkVersionFull"/>

  </staging-public-group>

  </staging-public-group>