summaryrefslogtreecommitdiffstats
path: root/src/com/android/bluetooth/hdp
diff options
context:
space:
mode:
authorFred <fredc@broadcom.com>2012-07-31 21:14:11 -0700
committerMatthew Xie <mattx@google.com>2012-08-08 12:17:23 -0700
commit15d36984a79d6e35c659edb0efdf929f0b526bd5 (patch)
treeffa035fef889aa54c2e4c4953f343f9e5bb1bd6c /src/com/android/bluetooth/hdp
parent0322ae1f5e8ea55c391145e7925cb5962a97c11f (diff)
downloadandroid_packages_apps_Bluetooth-15d36984a79d6e35c659edb0efdf929f0b526bd5.tar.gz
android_packages_apps_Bluetooth-15d36984a79d6e35c659edb0efdf929f0b526bd5.tar.bz2
android_packages_apps_Bluetooth-15d36984a79d6e35c659edb0efdf929f0b526bd5.zip
Fix for BT turn on/off issues: NPE, FD/thread leaks, ANR.
This fix addresses numerous BT on/off issues found from the CTS test. Fixed fD/pipe leak in various state machine Looper objects by calling quit() function. Fixed cursor leak in AtPhonebook. Change Pbap to stop the RFCOMM listener on the STATE_TURNING_OFF instead of STATE_OFF. Removed several cleanup() methods causing NPE. Reduced RFCOMM listener timeout from 3 seconds to 300ms between retry. bug 6834336 Change-Id: I52423343d8f52f65294af0143f373871a9874d77
Diffstat (limited to 'src/com/android/bluetooth/hdp')
-rwxr-xr-xsrc/com/android/bluetooth/hdp/HealthService.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/bluetooth/hdp/HealthService.java b/src/com/android/bluetooth/hdp/HealthService.java
index b843bc657..f689cfcb1 100755
--- a/src/com/android/bluetooth/hdp/HealthService.java
+++ b/src/com/android/bluetooth/hdp/HealthService.java
@@ -114,15 +114,12 @@ public class HealthService extends ProfileService {
}
if(mHealthChannels != null) {
mHealthChannels.clear();
- mHealthChannels = null;
}
if(mHealthDevices != null) {
mHealthDevices.clear();
- mHealthDevices = null;
}
if(mApps != null) {
mApps.clear();
- mApps = null;
}
return true;
}