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

Commit 8aaa5cb3 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 am: 1ead84ce 

Change-Id: I11d18182c60b211c213385316512b0b1a6004946
parents 7af0a96a 1ead84ce

tests/integration/Android.bp

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

android_test {

    name: "NetworkStackIntegrationTests",

    name: "NetworkStackIntegrationTests",

    certificate: "networkstack",

    certificate: "networkstack",

    min_sdk_version: "29",

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

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

    test_suites: ["device-tests"],

    test_suites: ["device-tests"],

    static_libs: [

    static_libs: [

tests/integration/AndroidManifest.xml

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

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

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

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

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

          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

    <!-- 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

         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 Original line Diff line number Diff line
@@ -50,6 +50,7 @@ android_test { 




android_test {

android_test {

    name: "NetworkStackTests",

    name: "NetworkStackTests",

    min_sdk_version: "29",

    test_suites: ["device-tests"],

    test_suites: ["device-tests"],

    defaults: ["NetworkStackTestsDefaults"],

    defaults: ["NetworkStackTestsDefaults"],

    static_libs: ["NetworkStackApiStableLib"],

    static_libs: ["NetworkStackApiStableLib"],

tests/unit/AndroidManifest.xml

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

-->

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

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

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

          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.READ_LOGS" />

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

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