Snap for 7175096 from c4b9a8a988a23c6e07e507dc14c350bd283dc1b8 to sc-release (503e7e30) · Commits · e / os / android_frameworks_native

cmds/dumpstate/dumpstate.cpp

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1208,10 +1208,6 @@ static void DumpBlockStatFiles() {

	static void DumpPacketStats() {		static void DumpPacketStats() {
	DumpFile("NETWORK DEV INFO", "/proc/net/dev");		DumpFile("NETWORK DEV INFO", "/proc/net/dev");
	DumpFile("QTAGUID NETWORK INTERFACES INFO", "/proc/net/xt_qtaguid/iface_stat_all");
	DumpFile("QTAGUID NETWORK INTERFACES INFO (xt)", "/proc/net/xt_qtaguid/iface_stat_fmt");
	DumpFile("QTAGUID CTRL INFO", "/proc/net/xt_qtaguid/ctrl");
	DumpFile("QTAGUID STATS INFO", "/proc/net/xt_qtaguid/stats");
	}		}

	static void DumpIpAddrAndRules() {		static void DumpIpAddrAndRules() {

libs/binder/ndk/include_cpp/android/binder_to_string.h

+8 −3

Original line number	Original line	Diff line number	Diff line
	@@ -136,8 +136,7 @@ class ToEmptyString {
	template <typename _U>		template <typename _U>
	static std::enable_if_t<		static std::enable_if_t<
	#ifdef HAS_NDK_INTERFACE		#ifdef HAS_NDK_INTERFACE
	std::is_base_of_v<::ndk::ICInterface, _U> \|\| std::is_same_v<::ndk::SpAIBinder, _U> \|\|		std::is_base_of_v<::ndk::ICInterface, _U> \|\|
	std::is_same_v<::ndk::ScopedFileDescriptor, _U> \|\|
	std::is_same_v<::ndk::AParcelableHolder, _U>		std::is_same_v<::ndk::AParcelableHolder, _U>
	#else		#else
	std::is_base_of_v<IInterface, _U> \|\| std::is_same_v<IBinder, _U> \|\|		std::is_base_of_v<IInterface, _U> \|\| std::is_same_v<IBinder, _U> \|\|
	@@ -168,13 +167,19 @@ std::string ToString(const _T& t) {
	return std::to_string(t);		return std::to_string(t);
	} else if constexpr (std::is_same_v<std::string, _T>) {		} else if constexpr (std::is_same_v<std::string, _T>) {
	return t;		return t;
			#ifdef HAS_NDK_INTERFACE
			} else if constexpr (std::is_same_v<::ndk::SpAIBinder, _T>) {
			return (t.get() == nullptr) ? "(null)" : "";
			} else if constexpr (std::is_same_v<::ndk::ScopedFileDescriptor, _T>) {
			return (t.get() == -1) ? "(null)" : "";
			#endif
	#ifdef HAS_STRING16		#ifdef HAS_STRING16
	} else if constexpr (std::is_same_v<String16, _T>) {		} else if constexpr (std::is_same_v<String16, _T>) {
	std::stringstream out;		std::stringstream out;
	out << t;		out << t;
	return out.str();		return out.str();
	#endif		#endif
	} else if constexpr (details::IsPointerLike<_T>::value) {		} else if constexpr (details::IsPointerLike<_T>::value \|\| std::is_pointer_v<_T>) {
	if (!t) return "(null)";		if (!t) return "(null)";
	std::stringstream out;		std::stringstream out;
	out << ToString(*t);		out << ToString(*t);

libs/gui/Android.bp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -149,6 +149,10 @@ cc_library_shared {
	sampling: true,		sampling: true,
	profile_file: "libgui/libgui.profdata",		profile_file: "libgui/libgui.profdata",
	},		},

			lto: {
			thin: true,
			},
	}		}

	// Used by media codec services exclusively as a static lib for		// Used by media codec services exclusively as a static lib for

libs/renderengine/RenderEngine.cpp

+8 −5

Original line number	Original line	Diff line number	Diff line
	@@ -49,7 +49,8 @@ std::unique_ptr<RenderEngine> RenderEngine::create(const RenderEngineCreationArg
	case RenderEngineType::THREADED:		case RenderEngineType::THREADED:
	ALOGD("Threaded RenderEngine with GLES Backend");		ALOGD("Threaded RenderEngine with GLES Backend");
	return renderengine::threaded::RenderEngineThreaded::create(		return renderengine::threaded::RenderEngineThreaded::create(
	[args]() { return android::renderengine::gl::GLESRenderEngine::create(args); });		[args]() { return android::renderengine::gl::GLESRenderEngine::create(args); },
			renderEngineType);
	case RenderEngineType::SKIA_GL:		case RenderEngineType::SKIA_GL:
	ALOGD("RenderEngine with SkiaGL Backend");		ALOGD("RenderEngine with SkiaGL Backend");
	return renderengine::skia::SkiaGLRenderEngine::create(args);		return renderengine::skia::SkiaGLRenderEngine::create(args);
	@@ -66,12 +67,14 @@ std::unique_ptr<RenderEngine> RenderEngine::create(const RenderEngineCreationArg
	.setPrecacheToneMapperShaderOnly(args.precacheToneMapperShaderOnly)		.setPrecacheToneMapperShaderOnly(args.precacheToneMapperShaderOnly)
	.setSupportsBackgroundBlur(args.supportsBackgroundBlur)		.setSupportsBackgroundBlur(args.supportsBackgroundBlur)
	.setContextPriority(args.contextPriority)		.setContextPriority(args.contextPriority)
	.setRenderEngineType(RenderEngineType::SKIA_GL_THREADED)		.setRenderEngineType(renderEngineType)
	.build();		.build();
	ALOGD("Threaded RenderEngine with SkiaGL Backend");		ALOGD("Threaded RenderEngine with SkiaGL Backend");
	return renderengine::threaded::RenderEngineThreaded::create([skiaArgs]() {		return renderengine::threaded::RenderEngineThreaded::create(
			[skiaArgs]() {
	return android::renderengine::skia::SkiaGLRenderEngine::create(skiaArgs);		return android::renderengine::skia::SkiaGLRenderEngine::create(skiaArgs);
	});		},
			renderEngineType);
	}		}
	case RenderEngineType::GLES:		case RenderEngineType::GLES:
	default:		default:

libs/renderengine/gl/GLESRenderEngine.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -379,7 +379,8 @@ EGLConfig GLESRenderEngine::chooseEglConfig(EGLDisplay display, int format, bool
	GLESRenderEngine::GLESRenderEngine(const RenderEngineCreationArgs& args, EGLDisplay display,		GLESRenderEngine::GLESRenderEngine(const RenderEngineCreationArgs& args, EGLDisplay display,
	EGLConfig config, EGLContext ctxt, EGLSurface stub,		EGLConfig config, EGLContext ctxt, EGLSurface stub,
	EGLContext protectedContext, EGLSurface protectedStub)		EGLContext protectedContext, EGLSurface protectedStub)
	: mEGLDisplay(display),		: RenderEngine(args.renderEngineType),
			mEGLDisplay(display),
	mEGLConfig(config),		mEGLConfig(config),
	mEGLContext(ctxt),		mEGLContext(ctxt),
	mStubSurface(stub),		mStubSurface(stub),