commit 1d7d7d8449e9ce8402bcca9bc779e873f6ab3c9c
author Martin Stjernholm <mast@google.com> Mon Sep 02 03:45:53 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 02 03:45:53 2019 -0700
tree a3fd6da71aa7f58d612e34dd66c11e9fbc1f8a29
parent ad54bab42fed18343d1ba46d9fe2031b95250311
parent 6685d169f5e635783342cfed587eada3a461c254

Update logic for detecting pre-apexd services to check that the ART APEX is mounted.
am: cacf04351f

Change-Id: Ibe7463cf6445bf3fc37a1ae68cb38d4f1e3f1b60

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 9537843..7a20966 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -116,9 +116,10 @@
     return execv(c_strings[0], c_strings.data()) == 0;
 }
 
-static bool IsRuntimeApexReady() {
+static bool AreRuntimeApexesReady() {
     struct stat buf;
-    return stat("/apex/com.android.runtime/", &buf) == 0;
+    return stat("/apex/com.android.art/", &buf) == 0 &&
+           stat("/apex/com.android.runtime/", &buf) == 0;
 }
 
 unsigned long Service::next_start_order_ = 1;
@@ -406,11 +407,11 @@
         scon = *result;
     }
 
-    if (!IsRuntimeApexReady() && !pre_apexd_) {
-        // If this service is started before the runtime APEX gets available,
-        // mark it as pre-apexd one. Note that this marking is permanent. So
-        // for example, if the service is re-launched (e.g., due to crash),
-        // it is still recognized as pre-apexd... for consistency.
+    if (!AreRuntimeApexesReady() && !pre_apexd_) {
+        // If this service is started before the Runtime and ART APEXes get
+        // available, mark it as pre-apexd one. Note that this marking is
+        // permanent. So for example, if the service is re-launched (e.g., due
+        // to crash), it is still recognized as pre-apexd... for consistency.
         pre_apexd_ = true;
     }