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

Commit fabdb43a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents f82f607d 60bcf66b

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
@@ -35,7 +35,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}.