Merge 24Q3 to AOSP main
Bug: 357762254
Merged-In: Ia5f14b6fac52940a9a6e17e3aa75e729dabea092
Change-Id: I2de9bc70e059b4eb93cd1a1ca5e928a52255ff4e
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0556b06..70b81d5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -66,6 +66,8 @@
</intent-filter>
</receiver>
- <service android:name="MtpService"/>
+ <service android:name="MtpService"
+ android:permission="android.permission.MANAGE_USB"
+ android:exported="true"/>
</application>
</manifest>
diff --git a/res/xml/device_filter.xml b/res/xml/device_filter.xml
index 7afa2b1..1126e5a 100644
--- a/res/xml/device_filter.xml
+++ b/res/xml/device_filter.xml
@@ -15,6 +15,6 @@
-->
<resources>
<!-- filter for MTP/PTP devices -->
- <usb-device class="255" subclass="255" protocol="0" />
+ <usb-device class="255" subclass="255" protocol="0" interface-name="MTP" />
<usb-device class="6" subclass="1" protocol="1" />
</resources>