commit b5f04148bc7933196c0762cac4abad015ab4e461
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 22 18:49:32 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 22 18:49:33 2017 +0000
tree 00adddf2c308b1e5cff4cf510a9ff393825a73b3
parent 67137d497ff181792dcf0a67dc249176c5d4d87a
parent 56c2e79dd124b1d0b8668c6d35529404fa898c6f

Merge changes from topic 'vts_camera_tests'

* changes:
  Camera: Add camera capture request VTS tests
  Camera: Extend Camera VTS testing

bluetooth/1.0/default/async_fd_watcher.cc

diff --git a/bluetooth/1.0/default/async_fd_watcher.cc b/bluetooth/1.0/default/async_fd_watcher.cc
index a88aa27..287d007 100644
--- a/bluetooth/1.0/default/async_fd_watcher.cc
+++ b/bluetooth/1.0/default/async_fd_watcher.cc
@@ -41,12 +41,7 @@
   }
 
   // Start the thread if not started yet
-  int started = tryStartThread();
-  if (started != 0) {
-    return started;
-  }
-
-  return 0;
+  return tryStartThread();
 }
 
 int AsyncFdWatcher::ConfigureTimeout(