diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-07 17:02:02 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 17:02:02 -0800 |
| commit | 827bc6eb162722f0829359eaee47323d281b1157 (patch) | |
| tree | 444e2d785a3fa1a97142fedb0ce9fb2f51a725f4 /AndroidManifest.xml | |
| parent | 02f994010473de3d32b6d7270e8085f41a936c61 (diff) | |
| parent | b211df6fcbd7dcd055354b75afc2e68ea49a36d9 (diff) | |
| download | android_packages_apps_Bluetooth-827bc6eb162722f0829359eaee47323d281b1157.tar.gz android_packages_apps_Bluetooth-827bc6eb162722f0829359eaee47323d281b1157.tar.bz2 android_packages_apps_Bluetooth-827bc6eb162722f0829359eaee47323d281b1157.zip | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/packages/apps/Bluetooth into HEAD
Android 6.0.1 release 3
Change-Id: I3be439472d2eb426c5624267426bb7bb7bcbbf82
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 719e268a9..9b21ceec0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -33,6 +33,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" /> @@ -96,6 +97,14 @@ android:pathPrefix="/btavrcp_ct" android:permission="android.permission.ACCESS_BLUETOOTH_AVRCP_CT_DATA" /> </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"> |