MAP: Fix Issues for MAP Server on Bluedroid.

Handle SDP registeration and serversocket binding on
START/STOP MAP Service, instead from every MAP session
CONNECT/DISCONNECT .

Allow EMPTY Recipient address for pushEmail Drafts.

MAP and FTP concurrency issue fix.

Optimization for retreiving email message size for
GetMessagesListing Email.

Reject pushSMS for Vcard containing , or ; in Tel entry.

Change-Id: I738c416c2ea1296ea2b0af193bc5240d22a77185
CRs-fixed: 504042

1 files changed, 3 insertions, 5 deletions

diff --git a/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java b/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
index 9a18cc6..2f9c2c9 100644
--- a/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
+++ b/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
@@ -339,7 +339,7 @@ public class BluetoothFtpService extends Service {
             notifyAuthCancelled();
             removeAuthChallTimer();
             removeFtpNotification(NOTIFICATION_ID_ACCESS);
-        } else if (action.equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)) {
+        } else if (action.equals(BluetoothDevice.ACTION_ACL_DISCONNECTED) && isWaitingAuthorization) {
             BluetoothDevice device =
                 intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
             if (device != null && device.equals(mRemoteDevice)) {
@@ -457,12 +457,14 @@ public class BluetoothFtpService extends Service {
 
             if (mRfcommServerSocket != null) {
                 mRfcommServerSocket.close();
+                mRfcommServerSocket =null ;
             }
         }
 
         if (accept == true) {
             if (mConnSocket != null) {
                 mConnSocket.close();
+                mConnSocket = null;
             }
         }
     }
@@ -490,9 +492,6 @@ public class BluetoothFtpService extends Service {
             }
         }
 
-        mRfcommServerSocket = null;
-        mConnSocket = null;
-
         mHasStarted = false;
         if (stopSelfResult(mStartId)) {
             if (VERBOSE) Log.v(TAG, "successfully stopped ftp service");
@@ -557,7 +556,6 @@ public class BluetoothFtpService extends Service {
 
         try {
             closeRfcommSocket(false, true);
-            mConnSocket = null;
         } catch (IOException e) {
             Log.e(TAG, "closeSocket error: " + e.toString());
         }