Merge "[SettingsProvider] fix connectivity test" am: 5e64a14ccf

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

Change-Id: If61c289b6b66521cb8ca6df442697904f25cd7c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-04-21 13:09:47 +00:00 • committed by Automerger Merge Worker
commit bb015ef2af
3 changed files with 5 additions and 3 deletions

View file

@ -14,7 +14,8 @@
--> -->
<configuration description="Runs coverage tests for Connectivity"> <configuration description="Runs coverage tests for Connectivity">
<target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup"> <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
<option name="test-file-name" value="ConnectivityCoverageTests.apk" /> <option name="test-file-name" value="ConnectivityCoverageTests.apk" />
<option name="install-arg" value="-t" />
</target_preparer> </target_preparer>
<option name="test-tag" value="ConnectivityCoverageTests" /> <option name="test-tag" value="ConnectivityCoverageTests" />

View file

@ -50,7 +50,7 @@
<uses-permission android:name="android.permission.NETWORK_STATS_PROVIDER" /> <uses-permission android:name="android.permission.NETWORK_STATS_PROVIDER" />
<uses-permission android:name="android.permission.CONTROL_OEM_PAID_NETWORK_PREFERENCE" /> <uses-permission android:name="android.permission.CONTROL_OEM_PAID_NETWORK_PREFERENCE" />
<application> <application android:testOnly="true">
<uses-library android:name="android.test.runner" /> <uses-library android:name="android.test.runner" />
<uses-library android:name="android.net.ipsec.ike" /> <uses-library android:name="android.net.ipsec.ike" />
<activity <activity

View file

@ -15,7 +15,8 @@
--> -->
<configuration description="Runs Frameworks Networking Tests."> <configuration description="Runs Frameworks Networking Tests.">
<target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup"> <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
<option name="test-file-name" value="FrameworksNetTests.apk" /> <option name="test-file-name" value="FrameworksNetTests.apk" />
<option name="install-arg" value="-t" />
</target_preparer> </target_preparer>
<option name="test-suite-tag" value="apct" /> <option name="test-suite-tag" value="apct" />