diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-12 00:50:08 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-12 00:50:08 -0700 |
| commit | 71a813fe10d3ac39676e5d7f9dda83c8ac482018 (patch) | |
| tree | dc56e0209249ab3972aa3f76687ee3d71145acaa | |
| parent | 4b4d8147e1a58f20ac8b39d1e78b623d8f38633d (diff) | |
| parent | ea6eec14f2fe78d5eb09ee39a4a9e896b2fca61d (diff) | |
| download | android_packages_apps_Bluetooth-71a813fe10d3ac39676e5d7f9dda83c8ac482018.tar.gz android_packages_apps_Bluetooth-71a813fe10d3ac39676e5d7f9dda83c8ac482018.tar.bz2 android_packages_apps_Bluetooth-71a813fe10d3ac39676e5d7f9dda83c8ac482018.zip | |
Merge "Bluetooth: Avoid cleanup the scan manager if already cleaned up"
| -rw-r--r-- | src/com/android/bluetooth/gatt/GattService.java | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/com/android/bluetooth/gatt/GattService.java b/src/com/android/bluetooth/gatt/GattService.java index 654df69b9..05ff17a7d 100644 --- a/src/com/android/bluetooth/gatt/GattService.java +++ b/src/com/android/bluetooth/gatt/GattService.java @@ -198,16 +198,28 @@ public class GattService extends ProfileService { mServiceDeclarations.clear(); mActiveServiceDeclarations.clear(); mReliableQueue.clear(); - if (mAdvertiseManager != null) mAdvertiseManager.cleanup(); - if (mScanManager != null) mScanManager.cleanup(); + if (mAdvertiseManager != null) { + mAdvertiseManager.cleanup(); + mAdvertiseManager = null; + } + if (mScanManager != null) { + mScanManager.cleanup(); + mScanManager = null; + } return true; } protected boolean cleanup() { if (DBG) Log.d(TAG, "cleanup()"); cleanupNative(); - if (mAdvertiseManager != null) mAdvertiseManager.cleanup(); - if (mScanManager != null) mScanManager.cleanup(); + if (mAdvertiseManager != null) { + mAdvertiseManager.cleanup(); + mAdvertiseManager = null; + } + if (mScanManager != null) { + mScanManager.cleanup(); + mScanManager = null; + } return true; } |