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

Commit 99b39d80 authored by Pedro Loureiro's avatar Pedro Loureiro Committed by Android (Google) Code Review
Browse files

Merge "Add lint baseline to address NewApi errors" into sc-dev

parents 4cef24dd 633685e3

Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ java_library { 
    ],

    sdk_version: "system_30",

    visibility: ["//visibility:private"],

    lint: {

        baseline_filename: "lint-baseline-api-30-shims.xml",

    },

}



// Shims for APIs being added to the current development version of Android. These APIs are not
@@ -210,6 +213,9 @@ android_library { 
        "//packages/modules/NetworkStack/tests/unit",

        "//packages/modules/NetworkStack/tests/integration",

    ],

    lint: {

        baseline_filename: "lint-baseline-current-lib.xml",

    },

}



android_library {
@@ -228,6 +234,9 @@ android_library { 
        "//packages/modules/NetworkStack/tests/unit",

        "//packages/modules/NetworkStack/tests/integration",

    ],

    lint: {

        baseline_filename: "lint-baseline-stable-lib.xml",

    },

}



filegroup {

lint-baseline-api-30-shims.xml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"

        errorLine1="        return lp.getNat64Prefix();"

        errorLine2="                  ~~~~~~~~~~~~~~">

        <location

            file="packages/modules/NetworkStack/apishim/30/com/android/networkstack/apishim/api30/NetworkInformationShimImpl.java"

            line="85"

            column="19"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.net.LinkProperties#setNat64Prefix`"

        errorLine1="        lp.setNat64Prefix(prefix);"

        errorLine2="           ~~~~~~~~~~~~~~">

        <location

            file="packages/modules/NetworkStack/apishim/30/com/android/networkstack/apishim/api30/NetworkInformationShimImpl.java"

            line="90"

            column="12"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.net.LinkProperties#setDhcpServerAddress`"

        errorLine1="        lp.setDhcpServerAddress(serverAddress);"

        errorLine2="           ~~~~~~~~~~~~~~~~~~~~">

        <location

            file="packages/modules/NetworkStack/apishim/30/com/android/networkstack/apishim/api30/NetworkInformationShimImpl.java"

            line="109"

            column="12"/>

    </issue>



</issues>

lint-baseline-current-lib.xml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"

        errorLine1="        newLp.setNat64Prefix(netlinkLinkProperties.getNat64Prefix());"

        errorLine2="                                                   ~~~~~~~~~~~~~~">

        <location

            file="packages/modules/NetworkStack/src/android/net/ip/IpClient.java"

            line="1337"

            column="52"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.net.LinkProperties#setNat64Prefix`"

        errorLine1="        newLp.setNat64Prefix(netlinkLinkProperties.getNat64Prefix());"

        errorLine2="              ~~~~~~~~~~~~~~">

        <location

            file="packages/modules/NetworkStack/src/android/net/ip/IpClient.java"

            line="1337"

            column="15"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.telephony.NetworkRegistrationInfo#getCellIdentity`"

        errorLine1="                    nri == null ? null : nri.getCellIdentity());"

        errorLine2="                                             ~~~~~~~~~~~~~~~">

        <location

            file="packages/modules/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java"

            line="3088"

            column="46"/>

    </issue>



</issues>

lint-baseline-stable-lib.xml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"

        errorLine1="        newLp.setNat64Prefix(netlinkLinkProperties.getNat64Prefix());"

        errorLine2="                                                   ~~~~~~~~~~~~~~">

        <location

            file="packages/modules/NetworkStack/src/android/net/ip/IpClient.java"

            line="1337"

            column="52"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.net.LinkProperties#setNat64Prefix`"

        errorLine1="        newLp.setNat64Prefix(netlinkLinkProperties.getNat64Prefix());"

        errorLine2="              ~~~~~~~~~~~~~~">

        <location

            file="packages/modules/NetworkStack/src/android/net/ip/IpClient.java"

            line="1337"

            column="15"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.telephony.NetworkRegistrationInfo#getCellIdentity`"

        errorLine1="                    nri == null ? null : nri.getCellIdentity());"

        errorLine2="                                             ~~~~~~~~~~~~~~~">

        <location

            file="packages/modules/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java"

            line="3088"

            column="46"/>

    </issue>



</issues>

tests/integration/lint-baseline.xml

0 → 100644
+59 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.net.LinkProperties#getDhcpServerAddress`"

        errorLine1="        assertEquals(SERVER_ADDR, captor.getValue().getDhcpServerAddress());"

        errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~">

        <location

            file="packages/modules/NetworkStack/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java"

            line="1327"

            column="53"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"

        errorLine1="                argThat(lp -> Objects.equals(expected, lp.getNat64Prefix())));"

        errorLine2="                                                          ~~~~~~~~~~~~~~">

        <location

            file="packages/modules/NetworkStack/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java"

            line="1623"

            column="59"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"

        errorLine1="                lp -> !Objects.equals(unchanged, lp.getNat64Prefix())));"

        errorLine2="                                                    ~~~~~~~~~~~~~~">

        <location

            file="packages/modules/NetworkStack/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java"

            line="1629"

            column="53"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"

        errorLine1="        if (lp.getNat64Prefix() != null) {"

        errorLine2="               ~~~~~~~~~~~~~~">

        <location

            file="packages/modules/NetworkStack/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java"

            line="1660"

            column="16"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"

        errorLine1="            assertEquals(prefix, lp.getNat64Prefix());"

        errorLine2="                                    ~~~~~~~~~~~~~~">

        <location

            file="packages/modules/NetworkStack/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java"

            line="1661"

            column="37"/>

    </issue>



</issues>