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

Commit d47ad7b2 authored by Sergey Volnov's avatar Sergey Volnov Committed by Joanne Chung
Browse files

Limit HotwordDetection process number to 10 

Bug: 216095923
Test: existing CTS tests
Change-Id: I73d12ad84e2dce108dcc923c6ad400a2a1bdddd6
(cherry picked from commit bef5d91b)
(cherry picked from commit 6db1879a)
Merged-in: I73d12ad84e2dce108dcc923c6ad400a2a1bdddd6
parent ce0c044b

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -115,6 +115,7 @@ final class HotwordDetectionConnection { 
    private static final Duration MAX_UPDATE_TIMEOUT_DURATION =

    private static final Duration MAX_UPDATE_TIMEOUT_DURATION =

            Duration.ofMillis(MAX_UPDATE_TIMEOUT_MILLIS);

            Duration.ofMillis(MAX_UPDATE_TIMEOUT_MILLIS);

    private static final long RESET_DEBUG_HOTWORD_LOGGING_TIMEOUT_MILLIS = 60 * 60 * 1000; // 1 hour

    private static final long RESET_DEBUG_HOTWORD_LOGGING_TIMEOUT_MILLIS = 60 * 60 * 1000; // 1 hour

    private static final int MAX_ISOLATED_PROCESS_NUMBER = 10;





    // Hotword metrics

    // Hotword metrics

    private static final int METRICS_INIT_UNKNOWN_TIMEOUT =

    private static final int METRICS_INIT_UNKNOWN_TIMEOUT =
@@ -873,7 +874,8 @@ final class HotwordDetectionConnection { 
        ServiceConnection createLocked() {

        ServiceConnection createLocked() {

            ServiceConnection connection =

            ServiceConnection connection =

                    new ServiceConnection(mContext, mIntent, mBindingFlags, mUser,

                    new ServiceConnection(mContext, mIntent, mBindingFlags, mUser,

                            IHotwordDetectionService.Stub::asInterface, ++mRestartCount);

                            IHotwordDetectionService.Stub::asInterface,

                            mRestartCount++ % MAX_ISOLATED_PROCESS_NUMBER);

            connection.connect();

            connection.connect();





            updateAudioFlinger(connection, mAudioFlinger);

            updateAudioFlinger(connection, mAudioFlinger);