diff options
| author | Steve Kondik <shade@chemlab.org> | 2014-01-21 13:06:52 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-01-21 13:06:52 -0800 |
| commit | 8c0c4aa5bfd2bab5d810b6476f180c3bd3d78478 (patch) | |
| tree | 92c5efed479b8a812b459d05813f3715773da4f0 /AndroidManifest.xml | |
| parent | c80c21628685544eb275c817419bbfe6c361861a (diff) | |
| parent | 6557c32f8e763b46d8f8d9888571ed2f366b4b79 (diff) | |
| download | android_packages_apps_Bluetooth-8c0c4aa5bfd2bab5d810b6476f180c3bd3d78478.tar.gz android_packages_apps_Bluetooth-8c0c4aa5bfd2bab5d810b6476f180c3bd3d78478.tar.bz2 android_packages_apps_Bluetooth-8c0c4aa5bfd2bab5d810b6476f180c3bd3d78478.zip | |
Merge branch 'kitkat' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-11.0
Change-Id: If4406c5f5c7e2e05395805251f97a9b80e83b4e6
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6047292c8..bb7f1776d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -59,6 +59,10 @@ <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" /> +<uses-permission android:name="com.android.email.permission.ACCESS_PROVIDER"/> + <uses-permission android:name="com.android.email.permission.READ_ATTACHMENT"/> + + <!-- For PBAP Owner Vcard Info --> <uses-permission android:name="android.permission.READ_PROFILE"/> <application @@ -84,6 +88,13 @@ </service> <service android:process="@string/process" + android:name = ".btservice.QAdapterService"> + <intent-filter> + <action android:name="android.bluetooth.IQBluetooth" /> + </intent-filter> + </service> + <service + android:process="@string/process" android:name=".opp.BluetoothOppService" android:permission="android.permission.ACCESS_BLUETOOTH_SHARE" android:enabled="@bool/profile_supported_opp"/> @@ -199,7 +210,7 @@ android:process="@string/process" android:label="" android:excludeFromRecents="true" - android:configChanges="orientation|keyboardHidden" + android:configChanges="orientation|keyboardHidden|screenSize" android:enabled="@bool/profile_supported_opp"> </activity> <activity android:name=".pbap.BluetoothPbapActivity" @@ -295,5 +306,13 @@ <action android:name="android.bluetooth.IBluetoothHandsfreeClient" /> </intent-filter> </service> + <service + android:process="@string/process" + android:name = ".hid.HidDevService" + android:enabled="@bool/profile_supported_hidd"> + <intent-filter> + <action android:name="android.bluetooth.IBluetoothHidDevice" /> + </intent-filter> + </service> </application> </manifest> |