commit 86c891516964df27385686495a82f898f26d4324
author Xin Li <delphij@google.com> Mon Aug 06 16:50:36 2018 -0700
committer Xin Li <delphij@google.com> Mon Aug 06 16:50:36 2018 -0700
tree 7da889cb23ef26b729d36bdafce520d86d431ab1
parent 773135272c86740714ede852a32ae9baa7d73254
parent ee355a6599698b6de1c8d790995fa4d6823d1abf

Merge Android Pie into master

Bug: 112104996
Change-Id: I4f9a954ed98dcc3649e416835ac9b3dacbaca46c

esed/esed.cpp

diff --git a/esed/esed.cpp b/esed/esed.cpp
index 01e0eef..9bb83f0 100644
--- a/esed/esed.cpp
+++ b/esed/esed.cpp
@@ -42,7 +42,7 @@
 
 int main(int /* argc */, char** /* argv */) {
     LOG(INFO) << "Waiting for property...";
-    android::base::WaitForProperty("init.svc.ese_load", "stopped");
+    android::base::WaitForProperty("init.svc.vendor.ese_load", "stopped");
     LOG(INFO) << "Starting esed...";
 
     // Open connection to the eSE

esed/esed.rc

diff --git a/esed/esed.rc b/esed/esed.rc
index 572254a..779f10a 100644
--- a/esed/esed.rc
+++ b/esed/esed.rc
@@ -1,4 +1,4 @@
-service esed /vendor/bin/esed
+service vendor.esed /vendor/bin/esed
     class hal
     user ese
     group ese
@@ -6,9 +6,9 @@
 on post-fs-data
     mkdir /data/vendor/ese 0761 ese ese
     restorecon /data/vendor/ese
-    start ese_load
+    start vendor.ese_load
 
-service ese_load /vendor/bin/ese_load force
+service vendor.ese_load /vendor/bin/ese_load force
     disabled
     oneshot
     user ese