diff options
| author | 2019-09-05 16:53:28 +0000 | |
|---|---|---|
| committer | 2019-09-05 16:53:28 +0000 | |
| commit | b653dd0a088f3be9d0fccd3d2099b3f8ab63ca2c (patch) | |
| tree | a3796f67d19deece6118e60d2faebde9499ce083 /libs/ui/Fence.cpp | |
| parent | 0bc2361309d705f8c7f7766f1912fd0f7035d199 (diff) | |
| parent | 9c724d78b9f2e00a7d4de3bfd2c65f6226fa8529 (diff) | |
Merge "DO NOT MERGE - Merge Android 10 into master"
Diffstat (limited to 'libs/ui/Fence.cpp')
| -rw-r--r-- | libs/ui/Fence.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ui/Fence.cpp b/libs/ui/Fence.cpp index ed7ccb0bed..4ce891e148 100644 --- a/libs/ui/Fence.cpp +++ b/libs/ui/Fence.cpp @@ -110,7 +110,7 @@ nsecs_t Fence::getSignalTime() const { } struct sync_file_info* finfo = sync_file_info(mFenceFd); - if (finfo == NULL) { + if (finfo == nullptr) { ALOGE("sync_file_info returned NULL for fd %d", mFenceFd.get()); return SIGNAL_TIME_INVALID; } |