Partial revert of c72b95e622cf0c5a31f258851425070e24bf1f3c.

Jira: None.
Test: Fixes crash during boot up when u have more than 1
      app holding the lock.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>

diff --git a/common/core/gpudevice.cpp b/common/core/gpudevice.cpp
index 6cf476d..cc9da01 100644 (file)
--- a/common/core/gpudevice.cpp
+++ b/common/core/gpudevice.cpp
@@ -667,20 +667,13 @@ void GpuDevice::HandleRoutine() {
   //    we need to take control.
   // TODO: Add splash screen support.
   if (lock_fd_ != -1) {
-    if (flock(lock_fd_, LOCK_EX | LOCK_NB) != 0) {
-      ITRACE(
-          "Another process is holding hwc lock, "
-          "wait until it releases the lock.");
-      display_manager_->IgnoreUpdates();
-      update_ignored = true;
-
-      if (flock(lock_fd_, LOCK_EX) != 0) {
-        ETRACE("Failed to wait on the hwc lock.");
-      } else {
-        ITRACE("Successfully grabbed the hwc lock.");
-      }
+    display_manager_->IgnoreUpdates();
+    update_ignored = true;
+
+    if (flock(lock_fd_, LOCK_EX) != 0) {
+      ETRACE("Failed to wait on the hwc lock.");
     } else {
-      ITRACE("No other process hold the hwc lock.");
+      ITRACE("Successfully grabbed the hwc lock.");
     }
 
     close(lock_fd_);