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

Commit 1c681a37 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" into main am: fabdb43a am: 2e3274f3 am: 22f48a2b am: 513c622e

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



Change-Id: I8089af00d23e8680e319b248fafc30aee626f33d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dd07f8ab 513c622e

media/java/android/media/Cea708CaptionRenderer.java

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ class Cea708CCParser { 
    private final StringBuffer mBuffer = new StringBuffer();

    private int mCommand = 0;



    // Assign a dummy listener in order to avoid null checks.

    // Assign a placeholder listener in order to avoid null checks.

    private DisplayListener mListener = new DisplayListener() {

        @Override

        public void emitEvent(CaptionEvent event) {

media/java/android/media/voice/KeyphraseModelManager.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import java.util.Objects; 
 * This class provides management of voice based sound recognition models. Usage of this class is

 * restricted to system or signature applications only. This allows OEMs to write apps that can

 * manage voice based sound trigger models.

 * Callers of this class are expected to have whitelist manifest permission MANAGE_VOICE_KEYPHRASES.

 * Callers of this class are expected to have allowlist manifest permission MANAGE_VOICE_KEYPHRASES.

 * Callers of this class are expected to be the designated voice interaction service via

 * {@link Settings.Secure.VOICE_INTERACTION_SERVICE} or a bundled voice model enrollment application

 * detected by {@link android.hardware.soundtrigger.KeyphraseEnrollmentInfo}.