commit 8f09b6abecbd8bf0e00c72b5eab6dd743e0f35ac
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Aug 05 03:28:04 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Aug 05 03:28:04 2017 +0000
tree 8777840a106a90cb8e7c73d1e6b267cfa171760b
parent e018119bb3f3c231ca01a3ef407f715718a549ff
parent df0b91683d63f988036e214d2193d00fca31010c

Merge "Fix race condition clearing VSYNC enable on VrFlinger startup." into oc-dr1-dev

libs/vr/libvrflinger/hardware_composer.cpp

diff --git a/libs/vr/libvrflinger/hardware_composer.cpp b/libs/vr/libvrflinger/hardware_composer.cpp
index d937c88..def9b7d 100644
--- a/libs/vr/libvrflinger/hardware_composer.cpp
+++ b/libs/vr/libvrflinger/hardware_composer.cpp
@@ -821,8 +821,9 @@
       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;