Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca am: 87dc13f249

am: c50c43667f

Change-Id: I11f57941eb00efafb14e0505131e66bc22fc68c6

1 files changed, 6 insertions, 0 deletions

diff --git a/core/jni/fd_utils-inl.h b/core/jni/fd_utils-inl.h
index 3f91feb254d7..d1129a3ef593 100644
--- a/core/jni/fd_utils-inl.h
+++ b/core/jni/fd_utils-inl.h
@@ -293,6 +293,12 @@ class FileDescriptorInfo {
       return true;
     }
 
+    // All regular files that are placed under this path are whitelisted automatically.
+    static const std::string kZygoteWhitelistPath = "/vendor/zygote_whitelist/";
+    if (StartsWith(path, kZygoteWhitelistPath) && path.find("/../") == std::string::npos) {
+      return true;
+    }
+
     return false;
   }