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

Commit b25d0643 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Merge "Fix SDK version detection." into udc-dev am: 8fffa7f2 

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



Change-Id: Ic29f1d39ee501446fb8c09d0643177ca797a410d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b5ef135d 8fffa7f2

core/java/android/service/voice/VoiceInteractionService.java

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public class VoiceInteractionService extends Service { 
    public static final String SERVICE_META_DATA = "android.voice_interaction";



    /**

     * For apps targeting Build.VERSION_CODES.TRAMISU and above, implementors of this

     * For apps targeting Build.VERSION_CODES.UPSIDE_DOWN_CAKE and above, implementors of this

     * service can create multiple AlwaysOnHotwordDetector instances in parallel. They will

     * also e ale to create a single SoftwareHotwordDetector in parallel with any other

     * active AlwaysOnHotwordDetector instances.
@@ -128,7 +128,7 @@ public class VoiceInteractionService extends Service { 
     * @hide

     */

    @ChangeId

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT)

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)

    static final long MULTIPLE_ACTIVE_HOTWORD_DETECTORS = 193232191L;



    IVoiceInteractionService mInterface = new IVoiceInteractionService.Stub() {