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

Commit 629a0861 authored by Shenglei Mao's avatar Shenglei Mao Committed by Android (Google) Code Review
Browse files

Merge "Allow voice interaction service to be started even if voice recognition... 

Merge "Allow voice interaction service to be started even if voice recognition service is null." into main
parents a902c053 f34d3e50

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

+9 −9
Original line number Diff line number Diff line
@@ -2582,7 +2582,6 @@ public class VoiceInteractionManagerService extends SystemService { 
                        if (anyPackagesAppearing()) {

                            initRecognizer(userHandle);

                        }

                        return;

                    }



                    if (curInteractor != null) {
@@ -2631,7 +2630,7 @@ public class VoiceInteractionManagerService extends SystemService { 
                        }

                    }



                    // There is no interactor, so just deal with a simple recognizer.

                    if (curRecognizer != null) {

                        int change = isPackageDisappearing(curRecognizer.getPackageName());

                        if (change == PACKAGE_PERMANENT_CHANGE

                                || change == PACKAGE_TEMPORARY_CHANGE) {
@@ -2643,6 +2642,7 @@ public class VoiceInteractionManagerService extends SystemService { 
                        }

                    }

                }

            }

        };

    }