commit e0433c8d96d05ca59e4212f51a9e56e91f899145
author Corey Tabaka <eieio@google.com> Sat Aug 05 03:37:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Aug 05 03:37:28 2017 +0000
tree ad2c1d8d62e748ba668b35f40bdfd928af2f0339
parent 6aa5b4e7fdaa86a76e00e2508d7122e59cbd2aa2
parent 8f09b6abecbd8bf0e00c72b5eab6dd743e0f35ac

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

Change-Id: I671c34252d7e0cfedeb2b22d77e6e635aa3d907b

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;