Merge "Fix memory leak in MtpFfsHandle." into main
diff --git a/services/camera/virtualcamera/VirtualCameraRenderThread.cc b/services/camera/virtualcamera/VirtualCameraRenderThread.cc
index bf4a45d..becba90 100644
--- a/services/camera/virtualcamera/VirtualCameraRenderThread.cc
+++ b/services/camera/virtualcamera/VirtualCameraRenderThread.cc
@@ -557,8 +557,9 @@
std::chrono::nanoseconds VirtualCameraRenderThread::getSurfaceTimestamp(
std::chrono::nanoseconds timeSinceLastFrame) {
std::chrono::nanoseconds surfaceTimestamp = mEglSurfaceTexture->getTimestamp();
- if (surfaceTimestamp.count() < 0) {
- uint64_t lastSurfaceTimestamp = mLastSurfaceTimestampNanoseconds.load();
+ uint64_t lastSurfaceTimestamp = mLastSurfaceTimestampNanoseconds.load();
+ if (surfaceTimestamp.count() < 0 ||
+ surfaceTimestamp.count() == lastSurfaceTimestamp) {
if (lastSurfaceTimestamp > 0) {
// The timestamps were provided by the producer but we are
// repeating the last frame, so we increase the previous timestamp by