diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-02 23:07:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-02 23:07:26 +0000 |
| commit | bde18f58a78038c783e730b7681c0b52e6e84ab1 (patch) | |
| tree | 74c8329a668b154bc5b303b2ff0cfa2adc2c4e1f /media/jni | |
| parent | b2ccd88b3fab578d2157815784888e88f18739b6 (diff) | |
| parent | 19cb457e9482d867d59bd0ef8cd04c2ae52e36b0 (diff) | |
Merge "Update language to comply with Android's inclusive language guidance" am: 4e6e7d7238 am: 19cb457e94
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380556
Change-Id: I4711a07ce3df64317c0f8ef562506b91353ab691
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_media_MediaPlayer.cpp | 2 | ||||
| -rw-r--r-- | media/jni/android_media_MediaSync.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index e910add86d3c..82b746f6a9e5 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -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 diff --git a/media/jni/android_media_MediaSync.cpp b/media/jni/android_media_MediaSync.cpp index f75200868a0d..d1ce30a3e827 100644 --- a/media/jni/android_media_MediaSync.cpp +++ b/media/jni/android_media_MediaSync.cpp @@ -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 |