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

Commit 1ead84ce authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Set min_sdk to 29 for NetworkStack tests" am: c13b4ca4 am: b0fcad6d 

Change-Id: I5b8acc04a862613215dd76bfb5f61d208ea53f9a
parents ebbc1150 b0fcad6d

tests/integration/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
android_test {

    name: "NetworkStackIntegrationTests",

    certificate: "networkstack",

    min_sdk_version: "29",

    srcs: ["src/**/*.java"],

    test_suites: ["device-tests"],

    static_libs: [

tests/integration/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
<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/unit/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ android_test { 


android_test {

    name: "NetworkStackTests",

    min_sdk_version: "29",

    test_suites: ["device-tests"],

    defaults: ["NetworkStackTestsDefaults"],

    static_libs: ["NetworkStackApiStableLib"],

tests/unit/AndroidManifest.xml

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

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

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

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



    <uses-permission android:name="android.permission.READ_LOGS" />

    <uses-permission android:name="android.permission.WRITE_SETTINGS" />