commit 321391a96d446ab4637609616f1df2bec43628f5
author Treehugger Robot <android-build-prod@system.gserviceaccount.com> Tue Mar 24 19:20:18 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 24 19:20:18 2020 +0000
tree 3f74cea9643692bfc28411fba010e0f58353d4d6
parent b1586780f5329f4f5b53d874f80adb9fa1b83c4f
parent 77063232ed7c9e6a5d5f3e1b7a121143bdf6b4ec

Merge "A2dpSink: Exception handling in below cases." into q-keystone-qcom-dev

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;
             }
         }
     };