commit 3cc2fc9f24bf7484d0250faff5c1625cdc5703d6
author Paul Crowley <paulcrowley@google.com> Mon Jun 26 13:53:07 2017 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jun 28 22:02:59 2017 +0000
tree 9598805558bf8268c083ae8ad71a5b9603008b54
parent aaf918f03768afe451fc3d2d946ecfe33a27c032

Make esed wait until ese_load has completed.

Bug: 62586642
Test: Confirmed that ese_load completes before esed starts.

Change-Id: Ib6ce617eafcdf62fa9e75cd42aec66e374e26891
(cherry picked from commit de5b1725e315743c42aa9be4efb557a5098d1dd9)
(cherry picked from commit 95d41031376091648f8bfb925865e0061231e2e3)

esed/esed.cpp

diff --git a/esed/esed.cpp b/esed/esed.cpp
index 044a957..01e0eef 100644
--- a/esed/esed.cpp
+++ b/esed/esed.cpp
@@ -19,6 +19,7 @@
 #include <thread>
 
 #include <android-base/logging.h>
+#include <android-base/properties.h>
 #include <hidl/HidlTransportSupport.h>
 #include <utils/StrongPointer.h>
 
@@ -40,6 +41,8 @@
 using android::esed::Weaver;
 
 int main(int /* argc */, char** /* argv */) {
+    LOG(INFO) << "Waiting for property...";
+    android::base::WaitForProperty("init.svc.ese_load", "stopped");
     LOG(INFO) << "Starting esed...";
 
     // Open connection to the eSE