Bluetooth: Create ftp sdp record in accept thread

A case, where BT On/Off is running into loop, In failure case
it was stuck while creating ftp record, which was processing
in bt process main thread, which leads ANR. Hence creating ftp sdp
record in accept thread to avoid ANR.

CRs-fixed: 931421
Change-Id: Id6938a8c51e44b787c68ca6a5a551856bdff0f89

1 files changed, 9 insertions, 7 deletions

diff --git a/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java b/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
index 5d16d65..c231e41 100644
--- a/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
+++ b/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
@@ -404,12 +404,6 @@ public class BluetoothFtpService extends Service {
         VERBOSE = Log.isLoggable(BluetoothFtpService.LOG_TAG, Log.VERBOSE) ? true : false;
         Log.v(TAG, "Ftp Service startRfcommSocketListener");
 
-        if (mRfcommServerSocket == null) {
-            if (!initRfcommSocket()) {
-                closeService();
-                return;
-            }
-        }
         if (mRfcommAcceptThread == null) {
             mRfcommAcceptThread = new RfcommSocketAcceptThread();
             mRfcommAcceptThread.setName("BluetoothFtpRfcommAcceptThread");
@@ -425,7 +419,7 @@ public class BluetoothFtpService extends Service {
         // It's possible that create will fail in some cases. retry for 10 times
         for (int i = 0; i < CREATE_RETRY_TIME && !mInterrupted; i++) {
             try {
-                // It is mandatory for PSE to support initiation of bonding and
+                // It is mandatory for FTP to support initiation of bonding and
                 // encryption.
                 mRfcommServerSocket = mAdapter.listenUsingRfcommWithServiceRecord("OBEX File Transfer", FileTransfer.getUuid());
                 initSocketOK = true;
@@ -645,6 +639,14 @@ public class BluetoothFtpService extends Service {
 
         @Override
         public void run() {
+
+            if (mRfcommServerSocket == null) {
+                 if (!initRfcommSocket()) {
+                     closeService();
+                     return;
+                 }
+             }
+
             while (!stopped && mRfcommServerSocket != null) {
                 try {
                     Log.v(RTAG,"Run Accept thread");