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

Commit 80bfccd5 authored by Mårten Kongstad's avatar Mårten Kongstad
Browse files

Allow new minSdkVersionFull attribute in <uses-sdk> 

Extend the list of allowed attributes in the manifest tag <uses-sdk> to
include minSdkVersionFull. This new attribute works the same way as
minSdkVersion but supports minor versions.

Follow-up CLs will handle the ambiguity that will arise if both
minSdkVersion and minSdkVersionFull are specified.

Bug: 377689343
Test: m
Flag: android.content.pm.support_minor_versions_in_minsdkversion
Change-Id: I94c5f9b0c00678062d8a83cc0a1377941c2bb666
parent 946bce56

core/api/current.txt

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

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

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

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

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

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

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

core/res/res/values/attrs_manifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -2568,6 +2568,8 @@ 
             against a development branch, in which case it will only work against

             the development builds. -->

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

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

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

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

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

             was explicitly tested to work with the version specified here.

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

+2 −0
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ 
    <public name="pageSizeCompat" />

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

    <public name="shareRolePriority"/>

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

    <public name="minSdkVersionFull"/>

  </staging-public-group>



  <staging-public-group type="id" first-id="0x01b60000">