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

Merge "Add jar files from the runtime APEX in the whitelist." am: 4d3a2f95c6

Browse Source 
am: b5a3c59d3a

Change-Id: Iec1e66f533063cde4529a0f4d874418b4f01e0d6
This commit is contained in:
Nicolas Geoffray
2019-01-24 07:03:32 -08:00
committed by android-build-merger
parent 455d2a92da b5a3c59d3a
commit 319db3e9f7
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/fd_utils.cpp
View File

@@ -71,6 +71,7 @@ bool FileDescriptorWhitelist::IsAllowed(const std::string& path) const {
return true;
}
// Framework jars are allowed.
static const char* kFrameworksPrefix = "/system/framework/";
static const char* kJarSuffix = ".jar";
if (android::base::StartsWith(path, kFrameworksPrefix)
@@ -78,6 +79,13 @@ bool FileDescriptorWhitelist::IsAllowed(const std::string& path) const {
return true;
}
// Jars from the runtime apex are allowed.
static const char* kRuntimeApexPrefix = "/apex/com.android.runtime/javalib/";
if (android::base::StartsWith(path, kRuntimeApexPrefix)
&& android::base::EndsWith(path, kJarSuffix)) {
return true;
}
// Whitelist files needed for Runtime Resource Overlay, like these:
// /system/vendor/overlay/framework-res.apk
// /system/vendor/overlay-subdir/pg/framework-res.apk