[LSC] Add LOCAL_LICENSE_KINDS to packages/services/Mtp am: 3279257675 am: ec05c80394 am: 6e1bc4cd18
Original change: https://android-review.googlesource.com/c/platform/packages/services/Mtp/+/1588594
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4bb156b092f7abe30da2d4c69a7f48d85d4c1e7a
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fc3b7cb..0647979 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,65 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.mtp"
- android:sharedUserId="android.media">
- <uses-feature android:name="android.hardware.usb.host" />
- <uses-permission android:name="android.permission.ACCESS_MTP" />
- <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
- <uses-permission android:name="android.permission.MANAGE_USB" />
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
- <uses-permission android:name="android.permission.MANAGE_USERS" />
- <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
- <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
- <application
- android:process="android.process.media"
- android:label="@string/app_label"
- android:allowBackup="false"
- android:usesCleartextTraffic="true">
- <provider
- android:name=".MtpDocumentsProvider"
- android:authorities="com.android.mtp.documents"
- android:grantUriPermissions="true"
- android:exported="true"
- android:permission="android.permission.MANAGE_DOCUMENTS">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.mtp"
+ android:sharedUserId="android.media">
+ <uses-feature android:name="android.hardware.usb.host"/>
+ <uses-permission android:name="android.permission.ACCESS_MTP"/>
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+ <uses-permission android:name="android.permission.MANAGE_USB"/>
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+ <uses-permission android:name="android.permission.MANAGE_USERS"/>
+ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
+ <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE"/>
+ <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+
+ <application android:process="android.process.media"
+ android:label="@string/app_label"
+ android:allowBackup="false"
+ android:usesCleartextTraffic="true">
+ <provider android:name=".MtpDocumentsProvider"
+ android:authorities="com.android.mtp.documents"
+ android:grantUriPermissions="true"
+ android:exported="true"
+ android:permission="android.permission.MANAGE_DOCUMENTS">
<intent-filter>
- <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
+ <action android:name="android.content.action.DOCUMENTS_PROVIDER"/>
</intent-filter>
</provider>
- <service android:name=".MtpDocumentsService" />
+ <service android:name=".MtpDocumentsService"/>
<activity android:name=".ReceiverActivity"
- android:label="@string/downloads_app_label"
- android:icon="@mipmap/ic_launcher_download"
- android:theme="@android:style/Theme.NoDisplay"
- android:excludeFromRecents="true">
+ android:label="@string/downloads_app_label"
+ android:icon="@mipmap/ic_launcher_download"
+ android:theme="@android:style/Theme.NoDisplay"
+ android:excludeFromRecents="true"
+ android:exported="true">
<intent-filter>
- <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
+ <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"/>
</intent-filter>
<meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
- android:resource="@xml/device_filter" />
+ android:resource="@xml/device_filter"/>
</activity>
- <receiver android:name=".UsbIntentReceiver" android:exported="true">
+ <receiver android:name=".UsbIntentReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
- <action android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" />
+ <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"/>
+ <action android:name="android.hardware.usb.action.USB_DEVICE_DETACHED"/>
</intent-filter>
<meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
- android:resource="@xml/device_filter" />
+ android:resource="@xml/device_filter"/>
</receiver>
- <receiver android:name=".MtpReceiver">
+ <receiver android:name=".MtpReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.BOOT_COMPLETED" />
+ <action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter>
<intent-filter>
- <action android:name="android.hardware.usb.action.USB_STATE" />
+ <action android:name="android.hardware.usb.action.USB_STATE"/>
</intent-filter>
</receiver>
- <service android:name="MtpService" />
+ <service android:name="MtpService"/>
</application>
</manifest>
diff --git a/perf_tests/Android.bp b/perf_tests/Android.bp
new file mode 100644
index 0000000..8afd164
--- /dev/null
+++ b/perf_tests/Android.bp
@@ -0,0 +1,10 @@
+android_test {
+ name: "MtpServicePerfTests",
+ srcs: ["src/**/*.java"],
+ static_libs: ["androidx.test.rules"],
+ platform_apis: true,
+ instrumentation_for: "MtpService",
+ certificate: "media",
+ test_suites: ["device-tests"],
+
+}
diff --git a/perf_tests/Android.mk b/perf_tests/Android.mk
deleted file mode 100644
index 9713cd4..0000000
--- a/perf_tests/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules
-LOCAL_PACKAGE_NAME := MtpServicePerfTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_INSTRUMENTATION_FOR := MtpService
-LOCAL_CERTIFICATE := media
-LOCAL_COMPATIBILITY_SUITE += device-tests
-
-include $(BUILD_PACKAGE)
diff --git a/perf_tests/AndroidTest.xml b/perf_tests/AndroidTest.xml
index 8b7292b..8d1b349 100644
--- a/perf_tests/AndroidTest.xml
+++ b/perf_tests/AndroidTest.xml
@@ -13,12 +13,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Runs MtpDocumentsProviderPerfTests metric instrumentation.">
+<configuration description="Runs MtpServicePerfTests metric instrumentation.">
<option name="test-suite-tag" value="apct" />
<option name="test-suite-tag" value="apct-metric-instrumentation" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
- <option name="test-file-name" value="MtpDocumentsProviderPerfTests.apk" />
+ <option name="test-file-name" value="MtpServicePerfTests.apk" />
</target_preparer>
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
diff --git a/tests/Android.bp b/tests/Android.bp
new file mode 100644
index 0000000..0bb9793
--- /dev/null
+++ b/tests/Android.bp
@@ -0,0 +1,14 @@
+android_test {
+ name: "MtpServiceTests",
+ srcs: ["src/**/*.java"],
+ libs: [
+ "android.test.runner",
+ "android.test.base",
+ "android.test.mock",
+ ],
+ static_libs: ["junit"],
+ platform_apis: true,
+ instrumentation_for: "MtpService",
+ certificate: "media",
+ test_suites: ["device-tests"],
+}
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index af32953..0000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock
-LOCAL_STATIC_JAVA_LIBRARIES := junit
-LOCAL_PACKAGE_NAME := MtpServiceTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_INSTRUMENTATION_FOR := MtpService
-LOCAL_CERTIFICATE := media
-LOCAL_COMPATIBILITY_SUITE := device-tests
-
-include $(BUILD_PACKAGE)
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" />