aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2018-06-08 11:07:11 -0700
committerXin Li <delphij@google.com>2018-06-08 11:07:11 -0700
commitee355a6599698b6de1c8d790995fa4d6823d1abf (patch)
tree7da889cb23ef26b729d36bdafce520d86d431ab1
parentb4890d76efa77071a5b4f63bfa3add574c3a3e46 (diff)
parentf314bba6e9665c4789000447ee5d668f5481e99c (diff)
downloadlibese-ee355a6599698b6de1c8d790995fa4d6823d1abf.tar.gz
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-mastertemp_p_merge
Bug: 79597307 Change-Id: I3d371072ead160d735cd7cb5f688e5d3993e7386
-rw-r--r--esed/esed.cpp2
-rw-r--r--esed/esed.rc6
2 files changed, 4 insertions, 4 deletions
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 @@ using android::esed::Weaver;
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
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 @@ service esed /vendor/bin/esed
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