commit a1dad95b26a4c62f04b73df2d0841c3e9f621a17
author Linux Build Service Account <lnxbuild@localhost> Fri Jun 05 04:38:13 2020 -0700
committer Linux Build Service Account <lnxbuild@localhost> Fri Jun 05 04:38:13 2020 -0700
tree 9d01c34c584c2dd981c100a7a19439e943d00611
parent 6b33aabdbcbd4db1e34339ed0e5f6e6ba057441d
parent ac16296e6d8846b3e84dd838fa873529511fbb68

Merge ac16296e6d8846b3e84dd838fa873529511fbb68 on remote branch

Change-Id: I3cbe8d6f565b8c73bdd77c01eeef335a1472dc60

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
index 77af4a7..4d529f7 100755
--- a/src/com/android/bluetooth/opp/BluetoothOppService.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppService.java
@@ -337,7 +337,7 @@
                         mTransfer.onBatchCanceled();
                         mTransfer = null;
                     }
-                    unregisterReceivers();
+                    unregisterObserver();
                     synchronized (BluetoothOppService.this) {
                         if (mUpdateThread != null) {
                             mUpdateThread.interrupt();
@@ -510,12 +510,19 @@
             Log.v(TAG, "onDestroy");
         }
         stopListeners();
+
+        try {
+            unregisterReceiver(mBluetoothReceiver);
+        } catch (IllegalArgumentException e) {
+            Log.w(TAG, "unregisterReceiver " + e.toString());
+        }
+
         if (mHandler != null) {
             mHandler.removeCallbacksAndMessages(null);
         }
     }
 
-    private void unregisterReceivers() {
+    private void unregisterObserver() {
         try {
             if (mObserver != null) {
                 getContentResolver().unregisterContentObserver(mObserver);
@@ -524,11 +531,6 @@
         } catch (IllegalArgumentException e) {
             Log.w(TAG, "unregisterContentObserver " + e.toString());
         }
-        try {
-            unregisterReceiver(mBluetoothReceiver);
-        } catch (IllegalArgumentException e) {
-            Log.w(TAG, "unregisterReceiver " + e.toString());
-        }
     }
 
     /* suppose we auto accept an incoming OPUSH connection */