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

Commit b923cbee authored by Nicholas Ambur's avatar Nicholas Ambur Committed by Automerger Merge Worker
Browse files

Merge changes from topic "hotword-unbind-on-destroy" into udc-dev am: 054c430b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22561100



Change-Id: I4850a56157c5b6dd1ca01558e754807c04b9eb6d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5aec21e3 054c430b

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

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

                mActiveVisualQueryDetector = null;

            }

            }

            mActiveDetectors.remove(detector);

            mActiveDetectors.remove(detector);

            shutdownHotwordDetectionServiceIfRequiredLocked();

        }

    }



    private void shutdownHotwordDetectionServiceIfRequiredLocked() {

        for (HotwordDetector detector : mActiveDetectors) {

            if (detector.isUsingSandboxedDetectionService()) {

                return;

            }

        }



        try {

            mSystemService.shutdownHotwordDetectionService();

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }

        }

    }

    }

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -913,8 +913,10 @@ final class HotwordDetectionConnection { 
        }

        }

        // Handle case where all hotword detector sessions are destroyed with only the visual

        // Handle case where all hotword detector sessions are destroyed with only the visual

        // detector session left

        // detector session left

        if (mDetectorSessions.size() == 1

        boolean allHotwordDetectionServiceSessionsRemoved = mDetectorSessions.size() == 0

                && mDetectorSessions.get(0) instanceof VisualQueryDetectorSession) {

                || (mDetectorSessions.size() == 1 && mDetectorSessions.get(0)

                instanceof VisualQueryDetectorSession);

        if (allHotwordDetectionServiceSessionsRemoved) {

            unbindHotwordDetectionService();

            unbindHotwordDetectionService();

        }

        }

    }

    }