diff options
| author | Mårten Kongstad <marten.kongstad@sony.com> | 2019-02-25 10:54:09 +0100 |
|---|---|---|
| committer | Todd Kennedy <toddke@google.com> | 2019-04-02 11:07:10 -0700 |
| commit | 48c24cf1490be40c8b8ef44cfb6479a4895cdfe1 (patch) | |
| tree | 1cd09591f47e0ffead548f8c8f846a059ca239fb /core/jni/fd_utils.cpp | |
| parent | d5c80f29cd382f5c2b9332162e4a8f22e75260e1 (diff) | |
Add support for /odm/overlay
Add support for runtime resource overlay (RRO) APKs in /odm/overlay.
Bug: 121033532
Test: manual (adb push apk to /odm/overlay, reboot, cmd overlay list)
Change-Id: I0918d276dfa6a43054068d3f84ecd0d1639f1d0b
Diffstat (limited to 'core/jni/fd_utils.cpp')
| -rw-r--r-- | core/jni/fd_utils.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp index d8d46560876d..099635246f05 100644 --- a/core/jni/fd_utils.cpp +++ b/core/jni/fd_utils.cpp @@ -102,6 +102,8 @@ bool FileDescriptorWhitelist::IsAllowed(const std::string& path) const { static const char* kProductOverlayDir = "/product/overlay"; static const char* kSystemProductServicesOverlayDir = "/system/product_services/overlay/"; static const char* kProductServicesOverlayDir = "/product_services/overlay"; + static const char* kSystemOdmOverlayDir = "/system/odm/overlay"; + static const char* kOdmOverlayDir = "/odm/overlay"; static const char* kApkSuffix = ".apk"; if ((android::base::StartsWith(path, kOverlayDir) @@ -110,7 +112,9 @@ bool FileDescriptorWhitelist::IsAllowed(const std::string& path) const { || android::base::StartsWith(path, kSystemProductOverlayDir) || android::base::StartsWith(path, kProductOverlayDir) || android::base::StartsWith(path, kSystemProductServicesOverlayDir) - || android::base::StartsWith(path, kProductServicesOverlayDir)) + || android::base::StartsWith(path, kProductServicesOverlayDir) + || android::base::StartsWith(path, kSystemOdmOverlayDir) + || android::base::StartsWith(path, kOdmOverlayDir)) && android::base::EndsWith(path, kApkSuffix) && path.find("/../") == std::string::npos) { return true; |