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

Commit 8f18e2d7 authored by Ahaan Ugale's avatar Ahaan Ugale Committed by Automerger Merge Worker
Browse files

Merge "Use flag to control the restart period value." into tm-dev am: d252376e 

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

Change-Id: I78e0ce2a9120840735c328c9f3261c5a34e98b78
parents 774c6ec8 d252376e

core/java/android/provider/DeviceConfig.java

+7 −0
Original line number Diff line number Diff line
@@ -599,6 +599,13 @@ public final class DeviceConfig { 
    @TestApi

    public static final String NAMESPACE_SELECTION_TOOLBAR = "selection_toolbar";



    /**

     * Definitions for voice interaction related functions.

     *

     * @hide

     */

    public static final String NAMESPACE_VOICE_INTERACTION = "voice_interaction";



    /**

     * List of namespaces which can be read without READ_DEVICE_CONFIG permission

     *

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

+5 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import android.os.PersistableBundle; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SharedMemory;

import android.provider.DeviceConfig;

import android.service.voice.HotwordDetectedResult;

import android.service.voice.HotwordDetectionService;

import android.service.voice.HotwordDetector;
@@ -110,6 +111,7 @@ final class HotwordDetectionConnection { 
    private static final String TAG = "HotwordDetectionConnection";

    static final boolean DEBUG = false;



    private static final String KEY_RESTART_PERIOD_IN_SECONDS = "restart_period_in_seconds";

    // TODO: These constants need to be refined.

    private static final long VALIDATION_TIMEOUT_MILLIS = 4000;

    private static final long MAX_UPDATE_TIMEOUT_MILLIS = 6000;
@@ -120,7 +122,9 @@ final class HotwordDetectionConnection { 
     * 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 = 0;

    private static final int RESTART_PERIOD_SECONDS =

            DeviceConfig.getInt(DeviceConfig.NAMESPACE_VOICE_INTERACTION,

                    KEY_RESTART_PERIOD_IN_SECONDS, 0);

    private static final int MAX_ISOLATED_PROCESS_NUMBER = 10;



    // Hotword metrics