commit 0632b778331dfc46979b8865fdd530e61d5bdef9
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Aug 05 03:58:41 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Aug 05 03:58:41 2017 +0000
tree e3d0e101dea4cfd86d6e523cdc7e000dd159e057
parent e0433c8d96d05ca59e4212f51a9e56e91f899145
parent a564aa8c84efed8555119dff31109e588225b298

Merge "Fix build error from diamond merge" into oc-mr1-dev

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;