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

am: 8f09b6abec

Change-Id: I671c34252d7e0cfedeb2b22d77e6e635aa3d907b

1 files changed, 3 insertions, 2 deletions

diff --git a/libs/vr/libvrflinger/hardware_composer.cpp b/libs/vr/libvrflinger/hardware_composer.cpp
index 4479d1eb8f..11c137063e 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;