Merge "NullPointerException when starting VoiceInteractionManagerService"

am: b7fbe1104f

* commit 'b7fbe1104fd93b426dd6a6f2ed9dfc9cb12b4dd8':
  NullPointerException when starting VoiceInteractionManagerService
This commit is contained in:
Jorim Jaggi
2016-01-23 02:18:13 +00:00
committed by android-build-merger

View File

@@ -58,6 +58,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;