From 2045bdd958a84b150a1db15216debcb46cdcba3a Mon Sep 17 00:00:00 2001
From: Annie Chin <afchin@google.com>
Date: Thu, 7 Jul 2016 10:22:34 -0700
Subject: [PATCH] Add a null check for mImpl.

Bug: 30005941
Change-Id: I1212aa66be71b7ee0e990596272a33fa7530770f
---
 .../voiceinteraction/VoiceInteractionManagerService.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
index 794a73e0fe35c..6aa12decf573a 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
@@ -1043,7 +1043,9 @@ public class VoiceInteractionManagerService extends SystemService {
         public void registerVoiceInteractionSessionListener(
                 IVoiceInteractionSessionListener listener) {
             enforceCallingPermission(Manifest.permission.ACCESS_VOICE_INTERACTION_SERVICE);
-            mImpl.registerVoiceInteractionSessionListener(listener);
+            if (mImpl != null) {
+                mImpl.registerVoiceInteractionSessionListener(listener);
+            }
         }
 
         @Override