Memory profiling changes : Updated the Bluetooth code to handle cleaning up of object references (context, handlers, and collection objects ) during service cleanup.Memory profiling changes : Updated the Bluetooth code to handle cleaning up of object references (context, handlers, and collection objects ) during service cleanup.

Change-Id: I2b0235f71c1feaf32215b2aaf89a2e06d8fa7d73

1 files changed, 19 insertions, 0 deletions

diff --git a/src/com/android/bluetooth/hdp/HealthService.java b/src/com/android/bluetooth/hdp/HealthService.java
index af6b0b6e7..8b8077665 100644..100755
--- a/src/com/android/bluetooth/hdp/HealthService.java
+++ b/src/com/android/bluetooth/hdp/HealthService.java
@@ -106,6 +106,23 @@ public class HealthService extends Service {
     public void onDestroy() {
         super.onDestroy();
         if (DBG) log("Destroying service.");
+
+        //Cleanup other object references
+        if(mHealthChannels != null) {
+            mHealthChannels.clear();
+            mHealthChannels = null;
+        }
+        if(mHealthDevices != null) {
+            mHealthDevices.clear();
+            mHealthDevices = null;
+        }
+        if(mApps != null) {
+            mApps.clear();
+            mApps = null;
+        }
+        if(mAdapter != null)
+            mAdapter = null;
+
     }
 
     private void start() {
@@ -132,10 +149,12 @@ public class HealthService extends Service {
         if (DBG) log("stop()");
 
         //Cleanup looper
+        mHandler.removeCallbacksAndMessages(null);
         Looper looper = mHandler.getLooper();
         if (looper != null) {
             looper.quit();
         }
+        mHandler = null;
 
         //Cleanup native
         cleanupNative();