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

Commit 4e528edd authored by Daniel Kim's avatar Daniel Kim Committed by Android (Google) Code Review
Browse files

Merge "Disable proximity result for hotword" into tm-qpr-dev

parents 36f16a2f 4dd69f2e

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

+8 −0
Original line number Diff line number Diff line
@@ -86,6 +86,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;
@@ -185,7 +186,7 @@ final class HotwordDetectionConnection { 
    final int mUser;

    final Context mContext;



    @Nullable final AttentionManagerInternal mAttentionManagerInternal;

    @Nullable AttentionManagerInternal mAttentionManagerInternal = null;



    final AttentionManagerInternal.ProximityUpdateCallbackInternal mProximityCallbackInternal =

            this::setProximityMeters;
@@ -240,10 +241,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);