| commit | c7cd878cea300931ca6bad4719322c1ee6fd38db | [log] [tgz] |
|---|---|---|
| author | Lihao Liang <lihaoliang@google.com> | Sat Aug 01 01:06:45 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Aug 01 01:06:45 2020 +0000 |
| tree | af1675d3a97353fd72c8b6d0f12954417151d914 | |
| parent | a96821a4bfaaeb748ced61f8958bd9b4c5ee1a96 [diff] | |
| parent | cb53d839f8e6fcbe2e56b71d0b8d11cc85e58a41 [diff] |
Merge "Update language to comply with Android's inclusive language guidance" am: 6ec9ae5431 am: 0cbee5918d am: c050d1e648 am: cb53d839f8 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1384296 Change-Id: Iffb60f338d758d18c24320923109f40bf6d941f7
diff --git a/services/surfaceflinger/Scheduler/DispSync.cpp b/services/surfaceflinger/Scheduler/DispSync.cpp index ff91bf7..46112f5 100644 --- a/services/surfaceflinger/Scheduler/DispSync.cpp +++ b/services/surfaceflinger/Scheduler/DispSync.cpp
@@ -340,7 +340,7 @@ return nextEventTime; } - // Sanity check that the duration is close enough in length to a period without + // Check that the duration is close enough in length to a period without // falling into double-rate vsyncs. bool isCloseToPeriod(nsecs_t duration) { // Ratio of 3/5 is arbitrary, but it must be greater than 1/2.
diff --git a/services/surfaceflinger/Scheduler/DispSync.h b/services/surfaceflinger/Scheduler/DispSync.h index 832f08e..6fb5654 100644 --- a/services/surfaceflinger/Scheduler/DispSync.h +++ b/services/surfaceflinger/Scheduler/DispSync.h
@@ -227,7 +227,7 @@ // mZeroErrSamplesCount keeps track of how many times in a row there were // zero timestamps available in the mPresentFences array. - // Used to sanity check that we are able to calculate the model error. + // Used to check that we are able to calculate the model error. size_t mZeroErrSamplesCount; // Whether we have updated the vsync event model since the last resync.