diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-08-05 03:28:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-05 03:28:04 +0000 |
| commit | 8f09b6abecbd8bf0e00c72b5eab6dd743e0f35ac (patch) | |
| tree | 8777840a106a90cb8e7c73d1e6b267cfa171760b | |
| parent | e018119bb3f3c231ca01a3ef407f715718a549ff (diff) | |
| parent | df0b91683d63f988036e214d2193d00fca31010c (diff) | |
| download | native-8f09b6abecbd8bf0e00c72b5eab6dd743e0f35ac.tar.gz | |
Merge "Fix race condition clearing VSYNC enable on VrFlinger startup." into oc-dr1-dev
| -rw-r--r-- | libs/vr/libvrflinger/hardware_composer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/vr/libvrflinger/hardware_composer.cpp b/libs/vr/libvrflinger/hardware_composer.cpp index d937c889df..def9b7da33 100644 --- a/libs/vr/libvrflinger/hardware_composer.cpp +++ b/libs/vr/libvrflinger/hardware_composer.cpp @@ -821,8 +821,9 @@ void HardwareComposer::PostThread() { std::unique_lock<std::mutex> lock(post_thread_mutex_); ALOGI("HardwareComposer::PostThread: Entering quiescent state."); - // Tear down resources. - OnPostThreadPaused(); + // Tear down resources if necessary. + if (was_running) + OnPostThreadPaused(); was_running = false; post_thread_resumed_ = false; |