Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NullPointerException when starting VoiceInteractionManagerService"

Browse Source
This commit is contained in:
Jorim Jaggi
2016-01-23 02:09:36 +00:00
committed by Gerrit Code Review
parent 187c022bf1 7dbcbad577
commit b7fbe1104f
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/service/voice/VoiceInteractionServiceInfo.java
View File

@@ -58,6 +58,10 @@ public class VoiceInteractionServiceInfo {
} }
public VoiceInteractionServiceInfo(PackageManager pm, ServiceInfo si) { public VoiceInteractionServiceInfo(PackageManager pm, ServiceInfo si) {
if (si == null) {
mParseError = "Service not available";
return;
}
if (!Manifest.permission.BIND_VOICE_INTERACTION.equals(si.permission)) { if (!Manifest.permission.BIND_VOICE_INTERACTION.equals(si.permission)) {
mParseError = "Service does not require permission " mParseError = "Service does not require permission "
+ Manifest.permission.BIND_VOICE_INTERACTION; + Manifest.permission.BIND_VOICE_INTERACTION;