Merge "Add jar files from the runtime APEX in the whitelist." am: 4d3a2f95c6 am: b5a3c59d3a (574c6134) · Commits · e / os / android_frameworks_base

core/jni/fd_utils.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,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)
		@@ -79,6 +80,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