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

Commit 59c08f62 authored by Nicholas Ambur's avatar Nicholas Ambur
Browse files

fix ChangeIds population from voiceinteraction 

ChangeId annotations from service.voiceinteraction were not being interpreted by the platform_compat service.

Bug: 265117757
Test: manual testing; verify changeId in platform_compat dumpsys
Change-Id: I8129617b358a2c86e2abf20352a9d049923a29db
parent eadd950b

services/voiceinteraction/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ java_library_static { 
    srcs: [":services.voiceinteraction-sources"],

    libs: [

        "services.core",

        "app-compat-annotations",

        "android.hardware.power-V1-java",

        "android.hardware.power-V1.0-java",

    ],

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

+9 −11
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 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;

import android.service.voice.IMicrophoneHotwordDetectionVoiceInteractionCallback;
@@ -88,19 +87,18 @@ final class HotwordDetectionConnection { 
    static final boolean DEBUG = false;



    /**

     * For apps targeting Android API {@link Build.VERSION_CODES#UPSIDE_DOWN_CAKE} and above,

     * implementors of the {@link HotwordDetectionService} must not augment the phrase IDs which are

     * supplied via {@link HotwordDetectionService

     * #onDetect(AlwaysOnHotwordDetector.EventPayload, long, HotwordDetectionService.Callback)}.

     * For apps targeting Android API Build.VERSION_CODES#UPSIDE_DOWN_CAKE and above,

     * implementors of the HotwordDetectionService must not augment the phrase IDs which are

     * supplied via HotwordDetectionService

     * #onDetect(AlwaysOnHotwordDetector.EventPayload, long, HotwordDetectionService.Callback).

     *

     * <p>The {@link HotwordDetectedResult#getHotwordPhraseId()} must match one of the phrase IDs

     * from the {@link android.service.voice.AlwaysOnHotwordDetector

     * .EventPayload#getKeyphraseRecognitionExtras()} list.

     * <p>The HotwordDetectedResult#getHotwordPhraseId() must match one of the phrase IDs

     * from the AlwaysOnHotwordDetector.EventPayload#getKeyphraseRecognitionExtras() list.

     * </p>

     *

     * <p>This behavior change is made to ensure the {@link HotwordDetectionService} honors what

     * it receives from the {@link android.hardware.soundtrigger.SoundTriggerModule}, and it

     * cannot signal to the client application a phrase which was not origially detected.

     * <p>This behavior change is made to ensure the HotwordDetectionService honors what

     * it receives from the android.hardware.soundtrigger.SoundTriggerModule, and it

     * cannot signal to the client application a phrase which was not originally detected.

     * </p>

     */

    @ChangeId