commit f2e7e68960fa82fee5f39e73697c5984ca9fc242
author Corey Tabaka <eieio@google.com> Sat Aug 05 03:43:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Aug 05 03:43:57 2017 +0000
tree 784ad5af4266b46a44bdd7a273e51de14bf1a84e
parent 8acf5685a8f6dd450d113192b7e68db67a93c739
parent e0433c8d96d05ca59e4212f51a9e56e91f899145

Merge "Fix race condition clearing VSYNC enable on VrFlinger startup." into oc-dr1-dev am: 8f09b6abec
am: e0433c8d96

Change-Id: I3a2d60264479baa68561aedc0c44ad43291aeb8a

libs/vr/libvrflinger/hardware_composer.cpp

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