From 1b09c8cd4fa10c3f0918cb1e24bdd2fd60aeec88 Mon Sep 17 00:00:00 2001 From: Pavlin Radoslavov Date: Thu, 14 Apr 2016 17:49:45 -0700 Subject: [PATCH] Add a missing null-pointer check in HeadsetService.stop() Bug: 27678483 Change-Id: I288b905d6b3f827a94365d512305cd29e186f3d4 --- src/com/android/bluetooth/hfp/HeadsetService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/bluetooth/hfp/HeadsetService.java b/src/com/android/bluetooth/hfp/HeadsetService.java index cda51fce..10bf23a4 100755 --- a/src/com/android/bluetooth/hfp/HeadsetService.java +++ b/src/com/android/bluetooth/hfp/HeadsetService.java @@ -78,7 +78,9 @@ public class HeadsetService extends ProfileService { } catch (Exception e) { Log.w(TAG,"Unable to unregister headset receiver",e); } - mStateMachine.doQuit(); + if (mStateMachine != null) { + mStateMachine.doQuit(); + } return true; } -- 2.11.0