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

Merge "NullPointerException when starting VoiceInteractionManagerService" am: b7fbe1104f

Browse Source 
am: 5d6da4eab0

* commit '5d6da4eab024c13afbfef5cfec0f9f2b19168318':
  NullPointerException when starting VoiceInteractionManagerService
This commit is contained in:
Jorim Jaggi
2016-01-23 03:47:29 +00:00
committed by android-build-merger
parent 6f8429757b 5d6da4eab0
commit cbb2382992
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

@@ -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;