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

Commit 03872c07 authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed a bug with svelte and voice assist 

Handling the case that no info is around.
Bug: 20925281

Change-Id: Id5a4c4373877909a898c8852891a854eacbc1f6c
parent 31999808

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ public class VoiceInteractionManagerService extends SystemService { 
        public boolean activeServiceSupportsAssist() {

            enforceCallingPermission(Manifest.permission.ACCESS_VOICE_INTERACTION_SERVICE);

            synchronized (this) {

                return mImpl != null && mImpl.mInfo.getSupportsAssist();

                return mImpl != null && mImpl.mInfo != null && mImpl.mInfo.getSupportsAssist();

            }

        }
@@ -762,7 +762,8 @@ public class VoiceInteractionManagerService extends SystemService { 
        public boolean activeServiceSupportsLaunchFromKeyguard() throws RemoteException {

            enforceCallingPermission(Manifest.permission.ACCESS_VOICE_INTERACTION_SERVICE);

            synchronized (this) {

                return mImpl != null && mImpl.mInfo.getSupportsLaunchFromKeyguard();

                return mImpl != null && mImpl.mInfo != null

                        && mImpl.mInfo.getSupportsLaunchFromKeyguard();

            }

        }