summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorAjay Panicker <apanicke@google.com>2015-10-13 15:31:47 -0700
committerAjay Panicker <apanicke@google.com>2015-10-20 14:09:39 -0700
commit66d643091edba75b4524483ea640273344533378 (patch)
tree0c0bafb6577ef8d5c16ef28b0b79ad8d4f4f7358 /AndroidManifest.xml
parent4a9f9b0253fde7341bf9e12c5bd0e6f29fced4fc (diff)
downloadandroid_packages_apps_Bluetooth-66d643091edba75b4524483ea640273344533378.tar.gz
android_packages_apps_Bluetooth-66d643091edba75b4524483ea640273344533378.tar.bz2
android_packages_apps_Bluetooth-66d643091edba75b4524483ea640273344533378.zip
Fix file permissions for Bluetooth share
Used a file provider to serve up URIs to allow applications to access files in the external Bluetooth directory. Bug: 23367919 Change-Id: Iadcdcafb235f3eeb50a0e147f3ef982fc9ee38b3
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 85910aa46..3652fd3a0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -27,6 +27,7 @@
<uses-permission android:name="android.permission.BLUETOOTH_MAP" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<!-- WRITE_CONTACTS is used for test cases only -->
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
@@ -80,6 +81,14 @@
android:pathPrefix="/btopp"
android:permission="android.permission.ACCESS_BLUETOOTH_SHARE" />
</provider>
+ <provider android:name="android.support.v4.content.FileProvider"
+ android:authorities="com.google.android.bluetooth.fileprovider"
+ android:grantUriPermissions="true"
+ android:exported="false">
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/file_paths" />
+ </provider>
<service
android:process="@string/process"
android:name = ".btservice.AdapterService">