commit b1586780f5329f4f5b53d874f80adb9fa1b83c4f
author xiaowang <xiaowang@codeaurora.org> Sat Mar 21 11:22:31 2020 +0800
committer xiaowang <xiaowang@codeaurora.org> Tue Mar 24 18:43:35 2020 +0800
tree a9bfadd9713bbfb9533d1aab1c41924dbbcbfc5a
parent 942216bbf863f4e38003ae1924d9e3160f214ae2

OPP: Ensure trimDatabase run first before update and notification thread

Use Case:
1. Send a big file to DUT
2. reboot DUT during file transfer

Failure:
Sometimes fail notification seen after reboot device

Root Cause:
When opp service is started, one trimdatabase thread and update, notification thread will be launched.
tirmdatabase thread to clean some opp records, e.g. transfer interrupted due to power off.
if update or notification thread is running first before trimdatabase trim records,
fail notificdation will be seen.

Fix:
Ensure trimdatabase thread to clean up the records firstly before notification and update threads get to run.

CRs-Fixed: 2640918
Change-Id: I54e6b0c7f86be73263c378099557f4dee6a6cc49

src/com/android/bluetooth/opp/BluetoothOppService.java

diff --git a/src/com/android/bluetooth/opp/BluetoothOppService.java b/src/com/android/bluetooth/opp/BluetoothOppService.java
old mode 100644
new mode 100755
index 1324619..77af4a7
--- a/src/com/android/bluetooth/opp/BluetoothOppService.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppService.java
@@ -204,6 +204,7 @@
             @Override
             public void run() {
                 trimDatabase(contentResolver);
+                mHandler.sendMessage(mHandler.obtainMessage(MSG_START_UPDATE_THREAD));
             }
         }.start();
 
@@ -232,12 +233,6 @@
         if (D) {
             Log.v(TAG, "start()");
         }
-        mObserver = new BluetoothShareContentObserver();
-        getContentResolver().registerContentObserver(BluetoothShare.CONTENT_URI, true, mObserver);
-        mNotifier = new BluetoothOppNotification(this);
-        mNotifier.mNotificationMgr.cancelAll();
-        mNotifier.updateNotification();
-        updateFromProvider();
         setBluetoothOppService(this);
         return true;
     }
@@ -318,6 +313,8 @@
 
     private static final int STOP_LISTENER = 200;
 
+    private static final int MSG_START_UPDATE_THREAD = 300;
+
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -468,6 +465,17 @@
                         }
                     }
                     break;
+                case MSG_START_UPDATE_THREAD:
+                    mObserver = new BluetoothShareContentObserver();
+                    getContentResolver().registerContentObserver(BluetoothShare.CONTENT_URI,
+                            true, mObserver);
+
+                    mNotifier = new BluetoothOppNotification(BluetoothOppService.this);
+                    mNotifier.mNotificationMgr.cancelAll();
+                    mNotifier.updateNotification();
+
+                    updateFromProvider();
+                    break;
             }
         }
     };