summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorHemant Gupta <hemantg@codeaurora.org>2015-07-08 22:32:35 +0530
committerHemant Gupta <hemantg@codeaurora.org>2015-07-15 17:48:29 +0530
commitbe0a005950fff5f93fee37a81c1455e42d5b5cd9 (patch)
tree7e8948d2bb1c448725f19d89295f7dfd7343ac00 /AndroidManifest.xml
parent49c2ac72e54bf10717182c7026a9870fdad5f7a2 (diff)
downloadandroid_packages_apps_BluetoothExt-be0a005950fff5f93fee37a81c1455e42d5b5cd9.tar.gz
android_packages_apps_BluetoothExt-be0a005950fff5f93fee37a81c1455e42d5b5cd9.tar.bz2
android_packages_apps_BluetoothExt-be0a005950fff5f93fee37a81c1455e42d5b5cd9.zip
SAP: Disable proprietary Sap code
This patch disables proprietary implementaiton of BT SAP. Change-Id: If1c179a0486ff0489f60ddb5bc8f6cf7dfee9d4a
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml32
1 files changed, 16 insertions, 16 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 98e82ce..5cd1622 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -99,11 +99,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<action android:name="android.bluetooth.device.action.ACL_DISCONNECTED"/>
</intent-filter>
</receiver>
--->
- <activity android:name=".ftp.BluetoothFtpActivity"
+ <activity android:name=".sap.BluetoothSapPermissionActivity"
android:process="@string/process"
android:excludeFromRecents="true"
- android:enabled="@bool/profile_supported_ftp"
+ android:enabled="@bool/profile_supported_sap"
android:theme="@*android:style/Theme.Holo.Dialog.Alert">
<intent-filter>
<category android:name="android.intent.category.DEFAULT" />
@@ -111,23 +110,27 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</activity>
<service
android:process="@string/process"
- android:name=".ftp.BluetoothFtpService"
- android:enabled="@bool/profile_supported_ftp" >
+ android:name=".sap.BluetoothSapService"
+ android:enabled="@bool/profile_supported_sap" >
+ <intent-filter>
+ <action android:name="android.bluetooth.IBluetoothSap" />
+ </intent-filter>
</service>
<receiver
android:process="@string/process"
- android:enabled="@bool/profile_supported_ftp"
- android:name=".ftp.BluetoothFtpReceiver">
+ android:enabled="@bool/profile_supported_sap"
+ android:name=".sap.BluetoothSapReceiver">
<intent-filter>
<action android:name="android.bluetooth.adapter.action.STATE_CHANGED"/>
<action android:name="android.bluetooth.device.action.BOND_STATE_CHANGED"/>
<action android:name="android.bluetooth.device.action.ACL_DISCONNECTED"/>
</intent-filter>
</receiver>
- <activity android:name=".sap.BluetoothSapPermissionActivity"
+-->
+ <activity android:name=".ftp.BluetoothFtpActivity"
android:process="@string/process"
android:excludeFromRecents="true"
- android:enabled="@bool/profile_supported_sap"
+ android:enabled="@bool/profile_supported_ftp"
android:theme="@*android:style/Theme.Holo.Dialog.Alert">
<intent-filter>
<category android:name="android.intent.category.DEFAULT" />
@@ -135,16 +138,13 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</activity>
<service
android:process="@string/process"
- android:name=".sap.BluetoothSapService"
- android:enabled="@bool/profile_supported_sap" >
- <intent-filter>
- <action android:name="android.bluetooth.IBluetoothSap" />
- </intent-filter>
+ android:name=".ftp.BluetoothFtpService"
+ android:enabled="@bool/profile_supported_ftp" >
</service>
<receiver
android:process="@string/process"
- android:enabled="@bool/profile_supported_sap"
- android:name=".sap.BluetoothSapReceiver">
+ android:enabled="@bool/profile_supported_ftp"
+ android:name=".ftp.BluetoothFtpReceiver">
<intent-filter>
<action android:name="android.bluetooth.adapter.action.STATE_CHANGED"/>
<action android:name="android.bluetooth.device.action.BOND_STATE_CHANGED"/>