Merge \"Add a null check for mImpl.\" into nyc-mr1-dev

am: 5a4cfd36c2 Change-Id: I26403fba055ca356ed69b599525dc7b6cf795b61
2016-07-07 18:05:45 +00:00
parent 18d0841650 5a4cfd36c2
commit 567be59cb4
1 changed files with 3 additions and 1 deletions
--- 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