Use pathPrefix filter instead of path for /btopp content

path is doing a full path match. It did not guard /btopp/
also fix a minor problem in tests/AndroidManifest.xml
bug 11148516

(cherry picked from commit 2819c1dbef39a712ab8adfcd36d2cb01f2379259)

Change-Id: I00b23e5c3a98422c2dd1cc220f2c121578ff5c8f

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index eab9005..55c40a7 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -72,7 +72,7 @@
             android:exported="true"
             android:process="@string/process">
             <path-permission
-                    android:path="/btopp"
+                    android:pathPrefix="/btopp"
                     android:permission="android.permission.ACCESS_BLUETOOTH_SHARE" />
         </provider>
         <service

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index a9fc19c..c022b22 100755 (executable)
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -49,7 +49,7 @@
     <application>
         <uses-library android:name="android.test.runner" />
         <uses-permission android:name="android.permission.ACCESS_BLUETOOTH_SHARE" />
-        <uses-permission android:permission="com.android.permission.WHITELIST_BLUETOOTH_DEVICE" />
+        <uses-permission android:name="com.android.permission.WHITELIST_BLUETOOTH_DEVICE" />
         <path-permission
                 android:path="/btopp"
                 android:permission="android.permission.ACCESS_BLUETOOTH_SHARE" />