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

Commit 19cb457e 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" am: 4e6e7d72 

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

Change-Id: I9ee9a80eb9eb808a9a7d2f46873b158ac1f4f00f
parents d13c410d 4e6e7d72

media/jni/android_media_MediaPlayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ android_media_MediaPlayer_getSyncParams(JNIEnv *env, jobject thiz) 
    ALOGV("getSyncSettings: %d %d %f %f",

            scp.sync.mSource, scp.sync.mAudioAdjustMode, scp.sync.mTolerance, scp.frameRate);



    // sanity check params

    // check params

    if (scp.sync.mSource >= AVSYNC_SOURCE_MAX

            || scp.sync.mAudioAdjustMode >= AVSYNC_AUDIO_ADJUST_MODE_MAX

            || scp.sync.mTolerance < 0.f

media/jni/android_media_MediaSync.cpp

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static jobject android_media_MediaSync_getSyncParams(JNIEnv *env, jobject thiz) 
    ALOGV("getSyncParams: %d %d %f %f",

            scs.sync.mSource, scs.sync.mAudioAdjustMode, scs.sync.mTolerance, scs.frameRate);



    // sanity check params

    // check params

    if (scs.sync.mSource >= AVSYNC_SOURCE_MAX

            || scs.sync.mAudioAdjustMode >= AVSYNC_AUDIO_ADJUST_MODE_MAX

            || scs.sync.mTolerance < 0.f

media/mca/filterfw/java/android/filterfw/core/FilterFunction.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public class FilterFunction { 
    public Frame execute(KeyValueMap inputMap) {

        int filterOutCount = mFilter.getNumberOfOutputs();



        // Sanity checks

        // Validation checks

        if (filterOutCount > 1) {

            throw new RuntimeException("Calling execute on filter " + mFilter + " with multiple "

                + "outputs! Use executeMulti() instead!");

media/mca/filterfw/jni/jni_native_program.cpp

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ jboolean Java_android_filterfw_core_NativeProgram_callNativeProcess(JNIEnv* env, 
                                                                    jobject output) {

  NativeProgram* program = ConvertFromJava<NativeProgram>(env, thiz);



  // Sanity checks

  // Validation checks

  if (!program || !inputs) {

    return JNI_FALSE;

  }