commit c2c679d6cfafb02796e1a9b5482cc8653689d732
author Alice Kuo <aliceypkuo@google.com> Thu Jul 30 16:14:48 2020 +0000
committer Alice Kuo <aliceypkuo@google.com> Thu Jul 30 16:15:09 2020 +0000
tree 79d3029836c401e7c2924c569423d2425f95d021
parent 31be55091f9714d8082f3c3725b8debdc0191498

Update language to comply with Android's inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for reference


Bug: 161896447
Change-Id: Ib87c9ebd45c5ee1b5f7296776e5978c12f7b45fc

media/jni/android_media_MediaPlayer.cpp

diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp
index 52e2661..40d213f 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -590,7 +590,7 @@
     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

diff --git a/media/jni/android_media_MediaSync.cpp b/media/jni/android_media_MediaSync.cpp
index f752008..d1ce30a 100644
--- a/media/jni/android_media_MediaSync.cpp
+++ b/media/jni/android_media_MediaSync.cpp
@@ -451,7 +451,7 @@
     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

diff --git a/media/mca/filterfw/java/android/filterfw/core/FilterFunction.java b/media/mca/filterfw/java/android/filterfw/core/FilterFunction.java
index ce81a18..ab9ae8a 100644
--- a/media/mca/filterfw/java/android/filterfw/core/FilterFunction.java
+++ b/media/mca/filterfw/java/android/filterfw/core/FilterFunction.java
@@ -43,7 +43,7 @@
     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

diff --git a/media/mca/filterfw/jni/jni_native_program.cpp b/media/mca/filterfw/jni/jni_native_program.cpp
index 1424607..cd4f718 100644
--- a/media/mca/filterfw/jni/jni_native_program.cpp
+++ b/media/mca/filterfw/jni/jni_native_program.cpp
@@ -134,7 +134,7 @@
                                                                     jobject output) {
   NativeProgram* program = ConvertFromJava<NativeProgram>(env, thiz);
 
-  // Sanity checks
+  // Validation checks
   if (!program || !inputs) {
     return JNI_FALSE;
   }