From 62fb56f2ba7d998e3e7416fc19d25ea91cc85111 Mon Sep 17 00:00:00 2001
From: Matthew Xie <mattx@google.com>
Date: Mon, 4 Aug 2014 10:40:24 -0700
Subject: [PATCH] Check null mHandler condition before invoking method on it

There is a path that clean up is called before stop call on HealthService
mHandler could be set to null
bug 16784750

Change-Id: Ie931fa502cf82d21c6bf97a8dc7035e5a1ed4b2e
---
 src/com/android/bluetooth/hdp/HealthService.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/com/android/bluetooth/hdp/HealthService.java b/src/com/android/bluetooth/hdp/HealthService.java
index cef06e81..21846c67 100644
--- a/src/com/android/bluetooth/hdp/HealthService.java
+++ b/src/com/android/bluetooth/hdp/HealthService.java
@@ -100,10 +100,12 @@ public class HealthService extends ProfileService {
     }
 
     protected boolean stop() {
-        mHandler.removeCallbacksAndMessages(null);
-        Looper looper = mHandler.getLooper();
-        if (looper != null) {
-            looper.quit();
+        if (mHandler != null) {
+            mHandler.removeCallbacksAndMessages(null);
+            Looper looper = mHandler.getLooper();
+            if (looper != null) {
+                looper.quit();
+            }
         }
         cleanupApps();
         return true;
-- 
2.11.0