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

Commit a719a694 authored by Joanne Chung's avatar Joanne Chung Committed by Android (Google) Code Review
Browse files

Merge changes from topic... 

Merge changes from topic "presubmit-am-0527d8f1cf0a4d4ba0831323b572842f-sc-v2-dev" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Trusted Hotword: Allow disabling periodic restarts. 2p: fc651fe0
  Trusted Hotword: Allow disabling periodic restarts.
parents 716f23d9 59ed3fba

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

+24 −12
Original line number Diff line number Diff line
@@ -115,6 +115,11 @@ final class HotwordDetectionConnection { 
    private static final Duration MAX_UPDATE_TIMEOUT_DURATION =

            Duration.ofMillis(MAX_UPDATE_TIMEOUT_MILLIS);

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

    /**

     * Time after which each HotwordDetectionService process is stopped and replaced by a new one.

     * 0 indicates no restarts.

     */

    private static final int RESTART_PERIOD_SECONDS = 3600; // 60 minutes

    private static final int MAX_ISOLATED_PROCESS_NUMBER = 10;



    // Hotword metrics
@@ -133,6 +138,7 @@ final class HotwordDetectionConnection { 
    // TODO: This may need to be a Handler(looper)

    private final ScheduledExecutorService mScheduledExecutorService =

            Executors.newSingleThreadScheduledExecutor();

    @Nullable private final ScheduledFuture<?> mCancellationTaskFuture;

    private final AtomicBoolean mUpdateStateAfterStartFinished = new AtomicBoolean(false);

    private final IBinder.DeathRecipient mAudioServerDeathRecipient = this::audioServerDied;

    private final @NonNull ServiceConnectionFactory mServiceConnectionFactory;
@@ -148,7 +154,6 @@ final class HotwordDetectionConnection { 
    private IMicrophoneHotwordDetectionVoiceInteractionCallback mSoftwareCallback;

    private Instant mLastRestartInstant;



    private ScheduledFuture<?> mCancellationTaskFuture;

    private ScheduledFuture<?> mCancellationKeyPhraseDetectionFuture;

    private ScheduledFuture<?> mDebugHotwordLoggingTimeoutFuture = null;
@@ -194,6 +199,9 @@ final class HotwordDetectionConnection { 
        mLastRestartInstant = Instant.now();

        updateStateAfterProcessStart(options, sharedMemory);



        if (RESTART_PERIOD_SECONDS <= 0) {

            mCancellationTaskFuture = null;

        } else {

            // TODO(volnov): we need to be smarter here, e.g. schedule it a bit more often, but wait

            // until the current session is closed.

            mCancellationTaskFuture = mScheduledExecutorService.scheduleAtFixedRate(() -> {
@@ -203,7 +211,8 @@ final class HotwordDetectionConnection { 
                    HotwordMetricsLogger.writeServiceRestartEvent(mDetectorType,

                            HOTWORD_DETECTION_SERVICE_RESTARTED__REASON__SCHEDULE);

                }

        }, 30, 30, TimeUnit.MINUTES);

            }, RESTART_PERIOD_SECONDS, RESTART_PERIOD_SECONDS, TimeUnit.SECONDS);

        }

    }



    private void initAudioFlingerLocked() {
@@ -341,7 +350,9 @@ final class HotwordDetectionConnection { 
                .setHotwordDetectionServiceProvider(null);

        mIdentity = null;

        updateServiceUidForAudioPolicy(Process.INVALID_UID);

        if (mCancellationTaskFuture != null) {

            mCancellationTaskFuture.cancel(/* may interrupt */ true);

        }

        if (mAudioFlinger != null) {

            mAudioFlinger.unlinkToDeath(mAudioServerDeathRecipient, /* flags= */ 0);

        }
@@ -759,6 +770,7 @@ final class HotwordDetectionConnection { 
    }



    public void dump(String prefix, PrintWriter pw) {

        pw.print(prefix); pw.print("RESTART_PERIOD_SECONDS="); pw.println(RESTART_PERIOD_SECONDS);

        pw.print(prefix);

        pw.print("mBound=" + mRemoteHotwordDetectionService.isBound());

        pw.print(", mValidatingDspTrigger=" + mValidatingDspTrigger);