Merge "Revert "Bluetooth-OPP: Start outbound transfer only after OPPService is up""

3 files changed, 17 insertions, 33 deletions

diff --git a/src/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java b/src/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java
index 8eb073906..aa2af081d 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java
@@ -38,7 +38,7 @@ public class BluetoothOppHandoverReceiver extends BroadcastReceiver {
 
         if (action.equals(Constants.ACTION_HANDOVER_SEND) ||
                action.equals(Constants.ACTION_HANDOVER_SEND_MULTIPLE)) {
-            if (V) Log.v(TAG, "Transfer initiated from HANDOVER");
+
             BluetoothDevice device =
                     (BluetoothDevice)intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
             if (device == null) {
diff --git a/src/com/android/bluetooth/opp/BluetoothOppManager.java b/src/com/android/bluetooth/opp/BluetoothOppManager.java
index 7d259e15f..8805818e5 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppManager.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppManager.java
@@ -119,8 +119,6 @@ public class BluetoothOppManager {
     // The time for which the whitelist entries remain valid.
     private static final int WHITELIST_DURATION_MS = 15000;
 
-    public boolean isOPPServiceUp = false;
-
     /**
      * Get singleton instance.
      */
@@ -429,28 +427,17 @@ public class BluetoothOppManager {
         @Override
         public void run() {
             Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
-            while (true) {
-                if (mRemoteDevice == null) {
-                    Log.e(TAG, "Target bt device is null!");
-                    return;
-                }
-
-                if (V) Log.v(TAG, "OPPServiceUP = " + isOPPServiceUp);
-                if (isOPPServiceUp) {
-                    if (mIsMultiple) {
-                        insertMultipleShare();
-                    } else {
-                        insertSingleShare();
-                    }
-
-                    synchronized (BluetoothOppManager.this) {
-                        mInsertShareThreadNum--;
-                    }
-                    return;
-                } else if (!isEnabled()) {
-                    Log.v(TAG, "BT is OFF");
-                    return;
-                }
+            if (mRemoteDevice == null) {
+                Log.e(TAG, "Target bt device is null!");
+                return;
+            }
+            if (mIsMultiple) {
+                insertMultipleShare();
+            } else {
+                insertSingleShare();
+            }
+            synchronized (BluetoothOppManager.this) {
+                mInsertShareThreadNum--;
             }
         }
 
diff --git a/src/com/android/bluetooth/opp/BluetoothOppService.java b/src/com/android/bluetooth/opp/BluetoothOppService.java
index c7c867051..c70d0fe17 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppService.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppService.java
@@ -148,8 +148,6 @@ public class BluetoothOppService extends Service {
      */
     private BluetoothOppObexServerSession mServerSession;
 
-    BluetoothOppManager mOppManager = null;
-
     @Override
     public IBinder onBind(Intent arg0) {
         throw new UnsupportedOperationException("Cannot bind to Bluetooth OPP Service");
@@ -170,11 +168,12 @@ public class BluetoothOppService extends Service {
         mNotifier.updateNotification();
 
         final ContentResolver contentResolver = getContentResolver();
-        synchronized (BluetoothOppService.this) {
-            trimDatabase(contentResolver);
-        }
+        new Thread("trimDatabase") {
+            public void run() {
+                trimDatabase(contentResolver);
+            }
+        }.start();
 
-        mOppManager = BluetoothOppManager.getInstance(this);
         IntentFilter filter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
         registerReceiver(mBluetoothReceiver, filter);
 
@@ -184,7 +183,6 @@ public class BluetoothOppService extends Service {
             } else {
                 startListener();
             }
-            mOppManager.isOPPServiceUp = true;
         }
         if (V) BluetoothOppPreference.getInstance(this).dump();
         updateFromProvider();
@@ -396,7 +394,6 @@ public class BluetoothOppService extends Service {
     public void onDestroy() {
         if (V) Log.v(TAG, "onDestroy");
         super.onDestroy();
-        mOppManager.isOPPServiceUp = false;
         getContentResolver().unregisterContentObserver(mObserver);
         unregisterReceiver(mBluetoothReceiver);
         if(mSocketListener != null) {