Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2020-08-02 22:19:05 +00:00
committed by Gerrit Code Review
parent dab3aaa5c6 c2c679d6cf
commit 4e6e7d7238
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/jni/android_media_MediaPlayer.cpp
View File

@@ -590,7 +590,7 @@ android_media_MediaPlayer_getSyncParams(JNIEnv *env, jobject thiz)
ALOGV("getSyncSettings: %d %d %f %f", ALOGV("getSyncSettings: %d %d %f %f",
scp.sync.mSource, scp.sync.mAudioAdjustMode, scp.sync.mTolerance, scp.frameRate); scp.sync.mSource, scp.sync.mAudioAdjustMode, scp.sync.mTolerance, scp.frameRate);
// sanity check params // check params
if (scp.sync.mSource >= AVSYNC_SOURCE_MAX if (scp.sync.mSource >= AVSYNC_SOURCE_MAX
|| scp.sync.mAudioAdjustMode >= AVSYNC_AUDIO_ADJUST_MODE_MAX || scp.sync.mAudioAdjustMode >= AVSYNC_AUDIO_ADJUST_MODE_MAX
|| scp.sync.mTolerance < 0.f || scp.sync.mTolerance < 0.f

2
media/jni/android_media_MediaSync.cpp
View File

@@ -451,7 +451,7 @@ static jobject android_media_MediaSync_getSyncParams(JNIEnv *env, jobject thiz)
ALOGV("getSyncParams: %d %d %f %f", ALOGV("getSyncParams: %d %d %f %f",
scs.sync.mSource, scs.sync.mAudioAdjustMode, scs.sync.mTolerance, scs.frameRate); scs.sync.mSource, scs.sync.mAudioAdjustMode, scs.sync.mTolerance, scs.frameRate);
// sanity check params // check params
if (scs.sync.mSource >= AVSYNC_SOURCE_MAX if (scs.sync.mSource >= AVSYNC_SOURCE_MAX
|| scs.sync.mAudioAdjustMode >= AVSYNC_AUDIO_ADJUST_MODE_MAX || scs.sync.mAudioAdjustMode >= AVSYNC_AUDIO_ADJUST_MODE_MAX
|| scs.sync.mTolerance < 0.f || scs.sync.mTolerance < 0.f

2
media/mca/filterfw/java/android/filterfw/core/FilterFunction.java
View File

@@ -43,7 +43,7 @@ public class FilterFunction {
public Frame execute(KeyValueMap inputMap) { public Frame execute(KeyValueMap inputMap) {
int filterOutCount = mFilter.getNumberOfOutputs(); int filterOutCount = mFilter.getNumberOfOutputs();
// Sanity checks // Validation checks
if (filterOutCount > 1) { if (filterOutCount > 1) {
throw new RuntimeException("Calling execute on filter " + mFilter + " with multiple " throw new RuntimeException("Calling execute on filter " + mFilter + " with multiple "
+ "outputs! Use executeMulti() instead!"); + "outputs! Use executeMulti() instead!");

2
media/mca/filterfw/jni/jni_native_program.cpp
View File

@@ -134,7 +134,7 @@ jboolean Java_android_filterfw_core_NativeProgram_callNativeProcess(JNIEnv* env,
jobject output) { jobject output) {
NativeProgram* program = ConvertFromJava<NativeProgram>(env, thiz); NativeProgram* program = ConvertFromJava<NativeProgram>(env, thiz);
// Sanity checks // Validation checks
if (!program || !inputs) { if (!program || !inputs) {
return JNI_FALSE; return JNI_FALSE;
} }