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

Commit c03340cb authored by Daniel Kim's avatar Daniel Kim Committed by Automerger Merge Worker
Browse files

Merge "Disable proximity result for hotword" into tm-qpr-dev am: 4e528edd am: c031c0fe 

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



Change-Id: I02e1d839409d3f00d1ad07f094d5b637af3904e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e8908f9d c031c0fe

core/java/android/service/voice/HotwordDetectionService.java

+8 −0
Original line number Diff line number Diff line
@@ -87,6 +87,14 @@ public abstract class HotwordDetectionService extends Service { 
     */

    public static final int MAXIMUM_NUMBER_OF_INITIALIZATION_STATUS_CUSTOM_ERROR = 2;



    /**

     * Feature flag for Attention Service.

     *

     * TODO(b/247920386): Add TestApi annotation

     * @hide

     */

    public static final boolean ENABLE_PROXIMITY_RESULT = false;



    /**

     * Indicates that the updated status is successful.

     */

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

+7 −4
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static android.service.attention.AttentionService.PROXIMITY_UNKNOWN; 
import static android.service.voice.HotwordDetectedResult.EXTRA_PROXIMITY_METERS;

import static android.service.voice.HotwordDetectionService.AUDIO_SOURCE_EXTERNAL;

import static android.service.voice.HotwordDetectionService.AUDIO_SOURCE_MICROPHONE;

import static android.service.voice.HotwordDetectionService.ENABLE_PROXIMITY_RESULT;

import static android.service.voice.HotwordDetectionService.INITIALIZATION_STATUS_SUCCESS;

import static android.service.voice.HotwordDetectionService.INITIALIZATION_STATUS_UNKNOWN;

import static android.service.voice.HotwordDetectionService.KEY_INITIALIZATION_STATUS;
@@ -189,7 +190,7 @@ final class HotwordDetectionConnection { 
    final int mUser;

    final Context mContext;



    @Nullable final AttentionManagerInternal mAttentionManagerInternal;

    @Nullable AttentionManagerInternal mAttentionManagerInternal = null;



    final AttentionManagerInternal.ProximityUpdateCallbackInternal mProximityCallbackInternal =

            this::setProximityMeters;
@@ -244,10 +245,12 @@ final class HotwordDetectionConnection { 
        mServiceConnectionFactory = new ServiceConnectionFactory(intent, bindInstantServiceAllowed);



        mRemoteHotwordDetectionService = mServiceConnectionFactory.createLocked();

        if (ENABLE_PROXIMITY_RESULT) {

            mAttentionManagerInternal = LocalServices.getService(AttentionManagerInternal.class);

            if (mAttentionManagerInternal != null) {

                mAttentionManagerInternal.onStartProximityUpdates(mProximityCallbackInternal);

            }

        }



        mLastRestartInstant = Instant.now();

        updateStateAfterProcessStart(options, sharedMemory);