Merge branch 'LNX.LA.3.5.2_RB1' of git://codeaurora.org/platform/vendor/qcom-opensource/bluetooth into cm-11.0

5 files changed, 6 insertions, 11 deletions

diff --git a/Android.mk b/Android.mk
index 5acf71f..f487428 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,16 +6,14 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
-src_dirs:= src/org/codeaurora/bluetooth/ftp \
+src_dirs:= src/org/codeaurora/bluetooth/btcservice \
+           src/org/codeaurora/bluetooth/map \
+           src/org/codeaurora/bluetooth/ftp \
            src/org/codeaurora/bluetooth/sap \
            src/org/codeaurora/bluetooth/dun \
            src/org/codeaurora/bluetooth/pxpservice \
            src/org/codeaurora/bluetooth/a4wp
 
-ifeq ($(BOARD_HAS_QCA_BT_AR3002),true)
-src_dirs += src/org/codeaurora/bluetooth/btcservice
-endif
-
 LOCAL_SRC_FILES := \
         $(call all-java-files-under, $(src_dirs)) \
         src/org/codeaurora/bluetooth/pxpservice/IPxpService.aidl
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0dc06c5..1fdc128 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -54,12 +54,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <uses-library android:name="javax.obex" />
         <uses-feature android:name="android.hardware.bluetooth_le" android:required="true" />
         <service
-            android:enabled="@bool/profile_supported_btc"
             android:name = ".btcservice.BTCService">
         </service>
         <receiver
             android:exported="true"
-            android:enabled="@bool/profile_supported_btc"
             android:name=".btcservice.BTCEventProvider">
             <intent-filter>
                 <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
diff --git a/bttestapp/src/org/codeaurora/bluetooth/bttestapp/MapTestActivity.java b/bttestapp/src/org/codeaurora/bluetooth/bttestapp/MapTestActivity.java
index e6ff140..6ed86d3 100644
--- a/bttestapp/src/org/codeaurora/bluetooth/bttestapp/MapTestActivity.java
+++ b/bttestapp/src/org/codeaurora/bluetooth/bttestapp/MapTestActivity.java
@@ -708,7 +708,7 @@ public class MapTestActivity extends MonkeyActivity implements GetTextDialogList
         bmsg.setFolder(mProfileService.getMapClient(mMasInstanceId).getCurrentPath());
 
         for (String rcpt : mEditOriginators) {
-            bmsg.addRecipient(createVcard(bmsg.getType(), rcpt));
+            bmsg.addOriginator(createVcard(bmsg.getType(), rcpt));
         }
 
         for (String orig : mEditRecipients) {
diff --git a/res/values/config.xml b/res/values/config.xml
index bc8dd68..df6fecf 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -17,5 +17,4 @@
     <bool name="profile_supported_map">false</bool>
     <bool name="profile_supported_sap">true</bool>
     <bool name="profile_supported_dun">true</bool>
-    <bool name="profile_supported_btc">false</bool>
 </resources>
diff --git a/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java b/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
index 02580e7..96ddb05 100644
--- a/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
+++ b/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
@@ -410,8 +410,8 @@ public class BluetoothFtpService extends Service {
             if (!initSocketOK) {
                 synchronized (this) {
                     try {
-                        if (VERBOSE) Log.v(TAG, "wait 3 seconds");
-                        Thread.sleep(3000);
+                        if (VERBOSE) Log.v(TAG, "wait 300 ms");
+                        Thread.sleep(300);
                     } catch (InterruptedException e) {
                         Log.e(TAG, "socketAcceptThread thread was interrupted (3)");
                         mInterrupted = true;