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

Commit b05f5739 authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed a crash with the voice interaction service 

Bug: 20925281
Change-Id: I136014ebc12c3afcb154722a8fec44b1d5f003e9
(cherry picked from commit 64904d39)
parent 737bff34

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

+6 −3
Original line number Diff line number Diff line
@@ -204,7 +204,8 @@ public class AssistManager { 


    private boolean getVoiceInteractorSupportsAssistGesture() {

        try {

            return mVoiceInteractionManagerService.activeServiceSupportsAssist();

            return mVoiceInteractionManagerService != null

                    && mVoiceInteractionManagerService.activeServiceSupportsAssist();

        } catch (RemoteException e) {

            Log.w(TAG, "Failed to call activeServiceSupportsAssistGesture", e);

            return false;
@@ -213,7 +214,8 @@ public class AssistManager { 


    public boolean canVoiceAssistBeLaunchedFromKeyguard() {

        try {

            return mVoiceInteractionManagerService.activeServiceSupportsLaunchFromKeyguard();

            return mVoiceInteractionManagerService != null

                    && mVoiceInteractionManagerService.activeServiceSupportsLaunchFromKeyguard();

        } catch (RemoteException e) {

            Log.w(TAG, "Failed to call activeServiceSupportsLaunchFromKeyguard", e);

            return false;
@@ -231,7 +233,8 @@ public class AssistManager { 


    private boolean isVoiceSessionRunning() {

        try {

            return mVoiceInteractionManagerService.isSessionRunning();

            return mVoiceInteractionManagerService != null

                    && mVoiceInteractionManagerService.isSessionRunning();

        } catch (RemoteException e) {

            Log.w(TAG, "Failed to call isSessionRunning", e);

            return false;