summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-06 22:54:15 +0000
committerXin Li <delphij@google.com>2021-10-06 22:54:15 +0000
commit89d23e9569f95ca6c50451e51c81df4524b99ca9 (patch)
treec2f876e790df9f3bf1faa6a1355bd5a516649c11 /tests
parente365ae93b18931a44014478c1ca30356de934d3b (diff)
parent3d791e886925e506dc1446301a24dc8ae1c6610e (diff)
downloadplatform_packages_services_Mtp-master.tar.gz
platform_packages_services_Mtp-master.tar.bz2
platform_packages_services_Mtp-master.zip
Merge Android 12HEADmaster
Bug: 202323961 Merged-In: I3b3ef768bb004daf8222e4171b72b02bb76497ab Change-Id: I8e55721c6f5a3e85af63ed0721ebefd72adf235d
Diffstat (limited to 'tests')
-rw-r--r--tests/Android.bp1
-rw-r--r--tests/AndroidManifest.xml20
-rw-r--r--tests/AndroidTest.xml6
3 files changed, 14 insertions, 13 deletions
diff --git a/tests/Android.bp b/tests/Android.bp
index 6278272..1d96b6e 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -1,5 +1,4 @@
package {
- // See: http://go/android-license-faq
default_applicable_licenses: ["Android-Apache-2.0"],
}
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index e1307e9..a064e50 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -1,21 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.mtp.tests"
- android:sharedUserId="android.media">
+ package="com.android.mtp.tests"
+ android:sharedUserId="android.media">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name="com.android.mtp.TestResultActivity"
- android:screenOrientation="locked"
- android:launchMode="singleInstance">
+ android:screenOrientation="locked"
+ android:launchMode="singleInstance"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
<instrumentation android:name="com.android.mtp.TestResultInstrumentation"
- android:targetPackage="com.android.mtp"
- android:label="Tests for MtpDocumentsProvider with the UI for output." />
+ android:targetPackage="com.android.mtp"
+ android:label="Tests for MtpDocumentsProvider with the UI for output."/>
</manifest>
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index f84131c..83b287a 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -13,13 +13,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Runs Tests for MtpDocumentsProvider with the UI for output.">
+<configuration description="Runs Tests for MtpService with the UI for output.">
<target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
- <option name="test-file-name" value="MtpDocumentsProviderTests.apk" />
+ <option name="test-file-name" value="MtpServiceTests.apk" />
</target_preparer>
<option name="test-suite-tag" value="apct" />
- <option name="test-tag" value="MtpDocumentsProviderTests" />
+ <option name="test-tag" value="MtpServiceTests" />
<test class="com.android.tradefed.testtype.InstrumentationTest" >
<option name="package" value="com.android.mtp.tests" />
<option name="runner" value="com.android.mtp.TestResultInstrumentation" />