Merge "Allow bootjars in system_ext." am: 6abe4fb0a7 am: 4ab8f542e9 am: ec82e99ca6 am: 1f3fa889d4 (e0e5f15a) · Commits · e / os / android_frameworks_base

core/jni/fd_utils.cpp

+11 −4

Original line number	Diff line number	Diff line
		@@ -85,12 +85,19 @@ 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)

		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.
		static const char* kArtApexPrefix = "/apex/com.android.art/javalib/";