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

Commit a33214e9 authored by Bram Bonné's avatar Bram Bonné Committed by Automerger Merge Worker
Browse files

Merge "Updates target API for InterfaceParamsTest." am: 523f5555 am: f588edc8 

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

Change-Id: I7669a366b74965b9174b8d1f6697eef847be83b3
parents e33c4011 f588edc8

tests/unit/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ java_defaults { 
// Tests for NetworkStackNext.

android_test {

    name: "NetworkStackNextTests",

    target_sdk_version: "current",

    srcs: [], // TODO: tests that only apply to the current, non-stable API can be added here

    test_suites: ["general-tests"],

    test_mainline_modules: ["CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"],
@@ -72,6 +73,7 @@ android_library { 
android_test {

    name: "NetworkStackTests",

    min_sdk_version: "29",

    target_sdk_version: "30",

    test_suites: ["general-tests", "mts"],

    test_mainline_modules: ["CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"],

    defaults: ["NetworkStackTestsDefaults"],

tests/unit/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.server.networkstack.tests">

    <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />



    <!-- DO NOT add privapp permissions here: they are inherited by

         NetworkStackCoverageTests, which is not signed by the platform key,