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

Commit d1f8e8c8 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Suppress NewApi lint errors in NetworkMonitor test." am: 5d71e47d am:... 

Merge "Suppress NewApi lint errors in NetworkMonitor test." am: 5d71e47d am: 2e73c7a0 am: 7169f5fd

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1748115

Change-Id: I0fd4b6a401859c5da5552db6f29439545f9ec6f2
parents fdf6d060 7169f5fd

tests/unit/lint-baseline.xml

+0 −99
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): `new android.net.NetworkCapabilities`"

        errorLine1="    private static final NetworkCapabilities CELL_METERED_CAPABILITIES = new NetworkCapabilities()"

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

        <location

            file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"

            line="297"

            column="74"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"

        errorLine1="            new NetworkCapabilities()"

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

        <location

            file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"

            line="302"

            column="13"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"

        errorLine1="            new NetworkCapabilities()"

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

        <location

            file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"

            line="308"

            column="13"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"

        errorLine1="            new NetworkCapabilities().addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);"

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

        <location

            file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"

            line="314"

            column="13"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"

        errorLine1="        final NetworkCapabilities nc = new NetworkCapabilities()"

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

        <location

            file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"

            line="670"

            column="40"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"

        errorLine1="        final NetworkCapabilities nc = new NetworkCapabilities()"

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

        <location

            file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"

            line="690"

            column="40"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"

        errorLine1="        final NetworkCapabilities meteredCap = new NetworkCapabilities()"

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

        <location

            file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"

            line="726"

            column="48"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"

        errorLine1="        final NetworkCapabilities nonMeteredCap = new NetworkCapabilities()"

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

        <location

            file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"

            line="746"

            column="51"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"

        errorLine1="        final NetworkCapabilities nc = new NetworkCapabilities()"

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

        <location

            file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"

            line="2149"

            column="40"/>

    </issue>



    <issue

        id="NewApi"

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

tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ import static java.util.Collections.singletonList; 
import static java.util.stream.Collectors.toList;



import android.annotation.NonNull;

import android.annotation.SuppressLint;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.ContextWrapper;
@@ -202,6 +203,7 @@ import javax.net.ssl.SSLHandshakeException; 


@RunWith(AndroidJUnit4.class)

@SmallTest

@SuppressLint("NewApi")  // Uses hidden APIs, which the linter would identify as missing APIs.

public class NetworkMonitorTest {

    private static final String LOCATION_HEADER = "location";

    private static final String CONTENT_TYPE_HEADER = "Content-Type";