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

Commit ea8b1a55 authored by Nicholas Ambur's avatar Nicholas Ambur
Browse files

AOHD do not unbind HotwordDetectionService on destroy 

AlwaysOnHotwordDetector should not be required to tear down the
HotwordDetectionService.

The VoiceInteractionManagerService will handle the unbinding and
shutdown of the service on its own.

Bug: 277392480
Test: atest AlwaysOnHotwordDetectorTest

Change-Id: Iec0af794595f0e8d143d7bab118c4b1f02569c31
parent aef17248

core/java/android/service/voice/VoiceInteractionService.java

+0 −15
Original line number Diff line number Diff line
@@ -1070,21 +1070,6 @@ public class VoiceInteractionService extends Service { 
                mActiveVisualQueryDetector = null;

            }

            mActiveDetectors.remove(detector);

            shutdownHotwordDetectionServiceIfRequiredLocked();

        }

    }



    private void shutdownHotwordDetectionServiceIfRequiredLocked() {

        for (HotwordDetector detector : mActiveDetectors) {

            if (detector.isUsingSandboxedDetectionService()) {

                return;

            }

        }



        try {

            mSystemService.shutdownHotwordDetectionService();

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }

    }