diff options
| author | Daniel Cashman <dcashman@google.com> | 2014-01-13 18:43:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-13 18:43:30 +0000 |
| commit | 18c10a1061cf300ecdb73139f10b5092de0f3cb7 (patch) | |
| tree | bdd7a555df54609bcc6dff71eec12f91bfb376b1 | |
| parent | ab2330077166c093123e09555c62836d979edf71 (diff) | |
| parent | 418431cf3156a69fbb4bdfcc1e450cad38b67a3a (diff) | |
| download | android_packages_apps_Bluetooth-18c10a1061cf300ecdb73139f10b5092de0f3cb7.tar.gz android_packages_apps_Bluetooth-18c10a1061cf300ecdb73139f10b5092de0f3cb7.tar.bz2 android_packages_apps_Bluetooth-18c10a1061cf300ecdb73139f10b5092de0f3cb7.zip | |
Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev
| -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" /> |