diff options
| author | Matthew Xie <mattx@google.com> | 2013-12-06 12:19:36 -0800 |
|---|---|---|
| committer | dcashman <dcashman@google.com> | 2014-01-03 15:10:10 -0800 |
| commit | 418431cf3156a69fbb4bdfcc1e450cad38b67a3a (patch) | |
| tree | a987e58df28b5e32ce6c7ca5f7aae2c055abd9ae | |
| parent | 025c8ec1e42ccac17c896809c4e6d2cb90b3c71a (diff) | |
| download | android_packages_apps_Bluetooth-418431cf3156a69fbb4bdfcc1e450cad38b67a3a.tar.gz android_packages_apps_Bluetooth-418431cf3156a69fbb4bdfcc1e450cad38b67a3a.tar.bz2 android_packages_apps_Bluetooth-418431cf3156a69fbb4bdfcc1e450cad38b67a3a.zip | |
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
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rwxr-xr-x | tests/AndroidManifest.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index eab9005f4..55c40a773 100644 --- 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 a9fc19c6f..c022b22cc 100755 --- 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" /> |