Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d6da4ea authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "NullPointerException when starting VoiceInteractionManagerService" 

am: b7fbe110

* commit 'b7fbe110':
  NullPointerException when starting VoiceInteractionManagerService
parents 08f736e7 b7fbe110

core/java/android/service/voice/VoiceInteractionServiceInfo.java

+4 −0
Original line number Diff line number Diff line
@@ -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;