Bluetooth-OPP: Synchronize OPP Database cleanup and Shareupdate threads

OPPService threads should be synchronized to avoid race condition.
Otherwise, during incoming file request if bluetooth sub system
retarted due some hardware error and if remote sends the file
immediately bluetooth is recovered application may crash after
accepting the request due to race condition between database cleanup
thread and shareupdate thread.

CRs-Fixed: 767691
Change-Id: Ie7e7bf588f5b8347afed6449898825111c41ae26

1 files changed, 3 insertions, 1 deletions

diff --git a/src/com/android/bluetooth/opp/BluetoothOppService.java b/src/com/android/bluetooth/opp/BluetoothOppService.java
index e0acd273c..760f70c51 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppService.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppService.java
@@ -166,7 +166,9 @@ public class BluetoothOppService extends Service {
         final ContentResolver contentResolver = getContentResolver();
         new Thread("trimDatabase") {
             public void run() {
-                trimDatabase(contentResolver);
+                synchronized (BluetoothOppService.this) {
+                    trimDatabase(contentResolver);
+                }
             }
         }.start();