27 lines
815 B
Diff
27 lines
815 B
Diff
From: Your Name <you@example.com>
|
|
Date: Wed, 12 Oct 2022 11:36:56 +0000
|
|
Subject: WIN ADDTO AImageReader CFI crash mitigations
|
|
|
|
---
|
|
gpu/ipc/service/gpu_init.cc | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
|
|
--- a/gpu/ipc/service/gpu_init.cc
|
|
+++ b/gpu/ipc/service/gpu_init.cc
|
|
@@ -614,10 +614,12 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
|
|
}
|
|
#endif // BUILDFLAG(IS_WIN)
|
|
|
|
+#if BUILDFLAG(IS_ANDROID)
|
|
// Disable AImageReader if the workaround is enabled.
|
|
if (gpu_feature_info_.IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {
|
|
base::android::AndroidImageReader::DisableSupport();
|
|
}
|
|
+#endif
|
|
|
|
if (gpu_feature_info_.status_values[GPU_FEATURE_TYPE_VULKAN] !=
|
|
kGpuFeatureStatusEnabled ||
|
|
--
|
|
2.25.1
|