Merge "NullPointerException when starting VoiceInteractionManagerService" am: b7fbe1104f

am: 5d6da4eab0

* commit '5d6da4eab024c13afbfef5cfec0f9f2b19168318':
  NullPointerException when starting VoiceInteractionManagerService

1 files changed, 4 insertions, 0 deletions

diff --git a/core/java/android/service/voice/VoiceInteractionServiceInfo.java b/core/java/android/service/voice/VoiceInteractionServiceInfo.java
index ebe3f47f0b02..4f58626b03e3 100644
--- a/core/java/android/service/voice/VoiceInteractionServiceInfo.java
+++ b/core/java/android/service/voice/VoiceInteractionServiceInfo.java
@@ -70,6 +70,10 @@ public class VoiceInteractionServiceInfo {
     }
 
     public VoiceInteractionServiceInfo(PackageManager pm, ServiceInfo si) {
+        if (si == null) {
+            mParseError = "Service not available";
+            return;
+        }
         if (!Manifest.permission.BIND_VOICE_INTERACTION.equals(si.permission)) {
             mParseError = "Service does not require permission "
                     + Manifest.permission.BIND_VOICE_INTERACTION;