| commit | eb83dcba85c32b69b242c9eb750c3fa4986477ba | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Feb 06 19:52:13 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Feb 06 19:52:14 2017 +0000 |
| tree | d748d3f0abcad3fd7f520919a4ed1d586cd776f1 | |
| parent | a491a766ad93af18aafa6c8b5ecff7b80029aa3b [diff] | |
| parent | b4213f7539a3172eed55dbee75f0a0d4ea747ffa [diff] |
Merge "Nullptr check for VSyncClient::Wait"
diff --git a/libs/vr/libdisplay/vsync_client.cpp b/libs/vr/libdisplay/vsync_client.cpp index a0fb313..c928a08 100644 --- a/libs/vr/libdisplay/vsync_client.cpp +++ b/libs/vr/libdisplay/vsync_client.cpp
@@ -26,7 +26,10 @@ status.GetErrorMessage().c_str()); return -status.error(); } - *timestamp_ns = status.get(); + + if (timestamp_ns != nullptr) { + *timestamp_ns = status.get(); + } return 0; }