Snap for 11479893 from 77add0b0f163a11792da4e2f0e694ed34e87589f to 24Q2-release (ba484196) · Commits · e / os / android_frameworks_native

data/etc/Android.bp

+12 −0

Original line number	Diff line number	Diff line
		@@ -280,6 +280,12 @@ prebuilt_etc {
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.telephony.carrierlock.prebuilt.xml",
		src: "android.hardware.telephony.carrierlock.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.telephony.gsm.prebuilt.xml",
		src: "android.hardware.telephony.gsm.xml",
		@@ -292,6 +298,12 @@ prebuilt_etc {
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.telephony.ims.singlereg.prebuilt.xml",
		src: "android.hardware.telephony.ims.singlereg.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.thread_network.prebuilt.xml",
		src: "android.hardware.thread_network.xml",

libs/binder/Android.bp

+1 −3

Original line number	Diff line number	Diff line
		@@ -664,9 +664,7 @@ cc_library {
		// Do not expand the visibility.
		visibility: [
		":__subpackages__",
		"//packages/modules/Virtualization/javalib/jni",
		"//packages/modules/Virtualization/vm_payload",
		"//packages/modules/Virtualization/demo_native",
		"//packages/modules/Virtualization:__subpackages__",
		"//device/google/cuttlefish/shared/minidroid:__subpackages__",
		"//system/software_defined_vehicle:__subpackages__",
		],

libs/renderengine/include/renderengine/RenderEngine.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,8 @@ public:

		static std::unique_ptr<RenderEngine> create(const RenderEngineCreationArgs& args);

		static bool canSupport(GraphicsApi);

		virtual ~RenderEngine() = 0;

		// ----- BEGIN DEPRECATED INTERFACE -----

libs/renderengine/skia/SkiaVkRenderEngine.cpp

+19 −8

Original line number	Diff line number	Diff line
		@@ -287,6 +287,7 @@ static GrVkGetProc sGetProc = [](const char* proc_name, VkInstance instance, VkD
		CHECK_NONNULL(vk##F)

		VulkanInterface initVulkanInterface(bool protectedContent = false) {
		const nsecs_t timeBefore = systemTime();
		VulkanInterface interface;

		VK_GET_PROC(EnumerateInstanceVersion);
		@@ -598,7 +599,9 @@ VulkanInterface initVulkanInterface(bool protectedContent = false) {
		interface.isProtected = protectedContent;
		// funcs already initialized

		ALOGD("%s: Success init Vulkan interface", __func__);
		const nsecs_t timeAfter = systemTime();
		const float initTimeMs = static_cast<float>(timeAfter - timeBefore) / 1.0E6;
		ALOGD("%s: Success init Vulkan interface in %f ms", __func__, initTimeMs);
		return interface;
		}

		@@ -654,17 +657,25 @@ static void sSetupVulkanInterface() {
		}
		}

		bool RenderEngine::canSupport(GraphicsApi graphicsApi) {
		switch (graphicsApi) {
		case GraphicsApi::GL:
		return true;
		case GraphicsApi::VK: {
		if (!sVulkanInterface.initialized) {
		sVulkanInterface = initVulkanInterface(false /* no protected content */);
		ALOGD("%s: initialized == %s.", __func__,
		sVulkanInterface.initialized ? "true" : "false");
		}
		return sVulkanInterface.initialized;
		}
		}
		}

		namespace skia {

		using base::StringAppendF;

		bool SkiaVkRenderEngine::canSupportSkiaVkRenderEngine() {
		VulkanInterface temp = initVulkanInterface(false /* no protected content */);
		ALOGD("SkiaVkRenderEngine::canSupportSkiaVkRenderEngine(): initialized == %s.",
		temp.initialized ? "true" : "false");
		return temp.initialized;
		}

		std::unique_ptr<SkiaVkRenderEngine> SkiaVkRenderEngine::create(
		const RenderEngineCreationArgs& args) {
		std::unique_ptr<SkiaVkRenderEngine> engine(new SkiaVkRenderEngine(args));

libs/renderengine/skia/SkiaVkRenderEngine.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -27,8 +27,6 @@ namespace skia {

		class SkiaVkRenderEngine : public SkiaRenderEngine {
		public:
		// Returns false if Vulkan implementation can't support SkiaVkRenderEngine.
		static bool canSupportSkiaVkRenderEngine();
		static std::unique_ptr<SkiaVkRenderEngine> create(const RenderEngineCreationArgs& args);
		~SkiaVkRenderEngine() override;