commit cb64183ecef46558c2a52afa2ed5716702c71777
author Casey Dahlin <sadmac@google.com> Fri Mar 11 15:12:31 2016 -0800
committer Casey Dahlin <sadmac@google.com> Wed Mar 16 11:34:10 2016 -0700
tree 09d8c0a786090989a0ea061b6996d158c51d6722
parent 2ab9b67af1ab783c176ef05d1c310ad2f21a6ac2

Switch webservd to binder in Android

This should fix chromeos building as a side effect, as we're not
depending on flags the gyp file doesn't set anymore.

Change-Id: Ibab792660600c761eb85f81e3f1fe4dce050b286
Test: Weaved can successfully connect to webservd.
Bug: 27204884
Bug: 27504653

libwebserv/binder_server.cc

diff --git a/libwebserv/binder_server.cc b/libwebserv/binder_server.cc
index fbc08fa..cd55804 100644
--- a/libwebserv/binder_server.cc
+++ b/libwebserv/binder_server.cc
@@ -228,6 +228,10 @@
   } else if (!BuildLocalState(binder)) {
     ClearLocalState();
   } else {
+    if (!on_server_online_.is_null()) {
+        message_loop_->PostTask(FROM_HERE, on_server_online_);
+    }
+
     // Got a binder, built up appropriate local state, our job is done.
     return;
   }
@@ -247,6 +251,9 @@
     }
   }
 
+  if (remote_server_.get() && !on_server_offline_.is_null()) {
+      message_loop_->PostTask(FROM_HERE, on_server_offline_);
+  }
   remote_server_.clear();
 }