Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow bootjars in system_ext." am: 6abe4fb0a7

Browse Source 
Change-Id: Id56f3b2ed464de43b9b029c16e5f874019b6a88c
This commit is contained in:
Chris Gross
2020-05-05 21:15:42 +00:00
committed by Automerger Merge Worker
parent d14004d53b 6abe4fb0a7
commit 4ab8f542e9
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/jni/fd_utils.cpp
View File

@@ -81,11 +81,18 @@ bool FileDescriptorWhitelist::IsAllowed(const std::string& path) const {
}
// Framework jars are allowed.
static const char* kFrameworksPrefix = "/system/framework/";
static const char* kFrameworksPrefix[] = {
"/system/framework/",
"/system_ext/framework/",
};
static const char* kJarSuffix = ".jar";
if (android::base::StartsWith(path, kFrameworksPrefix)
&& android::base::EndsWith(path, kJarSuffix)) {
return true;
for (const auto& frameworks_prefix : kFrameworksPrefix) {
if (android::base::StartsWith(path, frameworks_prefix)
&& android::base::EndsWith(path, kJarSuffix)) {
return true;
}
}
// Jars from the ART APEX are allowed.