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

Commit a46770f4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update the target SDK version to 30 in the... 

Merge "Update the target SDK version to 30 in the NetworkStackIntegrationTest." am: e9c74718 am: 72c4bf9d

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

Change-Id: Iccc1bed15c0d45d4f75ecd798666992b02124841
parents 53131b87 72c4bf9d

tests/integration/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ android_test { 
    platform_apis: true,

    test_suites: ["device-tests"],

    min_sdk_version: "29",

    target_sdk_version: "30",

}



// Network stack next integration tests.
@@ -111,6 +112,7 @@ android_test { 
    certificate: "networkstack",

    platform_apis: true,

    min_sdk_version: "29",

    target_sdk_version: "30",

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

    test_config: "AndroidTest_Coverage.xml",

    defaults: ["NetworkStackIntegrationTestsJniDefaults"],

tests/integration/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.server.networkstack.integrationtests"

          android:sharedUserId="android.uid.networkstack">

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



    <!-- Note: do not add any privileged or signature permissions that are granted

         to the network stack app. Otherwise, the test APK will install, but when the device is

tests/integration/AndroidManifest_coverage.xml

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.server.networkstack.coverage"

          android:sharedUserId="android.uid.networkstack">

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



    <!-- Note: do not add any privileged or signature permissions that are granted

         to the network stack app. Otherwise, the test APK will install, but when the device is