Snap for 5595753 from 8ef22b102ce2eaa5668adc2631ad24017777d610 to qt-release (41634220) · Commits · e / os / android_system_core

adb/daemon/usb.cpp

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -380,7 +380,12 @@ struct UsbFfsConnection : public Connection {
	<< ", wLength = " << static_cast<int>(event.u.setup.wLength);		<< ", wLength = " << static_cast<int>(event.u.setup.wLength);

	if ((event.u.setup.bRequestType & USB_DIR_IN)) {		if ((event.u.setup.bRequestType & USB_DIR_IN)) {
	LOG(WARNING) << "received a device-to-host control transfer, ignoring";		LOG(INFO) << "acking device-to-host control transfer";
			ssize_t rc = adb_write(control_fd_.get(), "", 0);
			if (rc != 0) {
			PLOG(ERROR) << "failed to write empty packet to host";
			break;
			}
	} else {		} else {
	std::string buf;		std::string buf;
	buf.resize(event.u.setup.wLength + 1);		buf.resize(event.u.setup.wLength + 1);

bootstat/bootstat.cpp

+2 −11

Original line number	Original line	Diff line number	Diff line
	@@ -1086,17 +1086,8 @@ void RecordAbsoluteBootTime(BootEventRecordStore* boot_event_store,
	void LogBootInfoToStatsd(std::chrono::milliseconds end_time,		void LogBootInfoToStatsd(std::chrono::milliseconds end_time,
	std::chrono::milliseconds total_duration, int32_t bootloader_duration_ms,		std::chrono::milliseconds total_duration, int32_t bootloader_duration_ms,
	double time_since_last_boot_sec) {		double time_since_last_boot_sec) {
	const auto reason = android::base::GetProperty(bootloader_reboot_reason_property, "");		auto reason = android::base::GetProperty(bootloader_reboot_reason_property, "<EMPTY>");
			auto system_reason = android::base::GetProperty(system_reboot_reason_property, "<EMPTY>");
	if (reason.empty()) {
	android::util::stats_write(android::util::BOOT_SEQUENCE_REPORTED, "<EMPTY>", "<EMPTY>",
	end_time.count(), total_duration.count(),
	(int64_t)bootloader_duration_ms,
	(int64_t)time_since_last_boot_sec * 1000);
	return;
	}

	const auto system_reason = android::base::GetProperty(system_reboot_reason_property, "");
	android::util::stats_write(android::util::BOOT_SEQUENCE_REPORTED, reason.c_str(),		android::util::stats_write(android::util::BOOT_SEQUENCE_REPORTED, reason.c_str(),
	system_reason.c_str(), end_time.count(), total_duration.count(),		system_reason.c_str(), end_time.count(), total_duration.count(),
	(int64_t)bootloader_duration_ms,		(int64_t)bootloader_duration_ms,

fastboot/device/usb_client.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,7 @@ constexpr int kMaxPacketSizeHs = 512;
	constexpr int kMaxPacketsizeSs = 1024;		constexpr int kMaxPacketsizeSs = 1024;

	constexpr size_t kFbFfsNumBufs = 16;		constexpr size_t kFbFfsNumBufs = 16;
	constexpr size_t kFbFfsBufSize = 32768;		constexpr size_t kFbFfsBufSize = 16384;

	constexpr const char* kUsbFfsFastbootEp0 = "/dev/usb-ffs/fastboot/ep0";		constexpr const char* kUsbFfsFastbootEp0 = "/dev/usb-ffs/fastboot/ep0";
	constexpr const char* kUsbFfsFastbootOut = "/dev/usb-ffs/fastboot/ep1";		constexpr const char* kUsbFfsFastbootOut = "/dev/usb-ffs/fastboot/ep1";

rootdir/etc/ld.config.legacy.txt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -58,6 +58,9 @@ namespace.default.link.runtime.shared_libs += libnativebridge.so
	namespace.default.link.runtime.shared_libs += libnativehelper.so		namespace.default.link.runtime.shared_libs += libnativehelper.so
	namespace.default.link.runtime.shared_libs += libnativeloader.so		namespace.default.link.runtime.shared_libs += libnativeloader.so
	namespace.default.link.runtime.shared_libs += libandroidicu.so		namespace.default.link.runtime.shared_libs += libandroidicu.so
			# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466
			namespace.default.link.runtime.shared_libs += libicui18n.so
			namespace.default.link.runtime.shared_libs += libicuuc.so

	# TODO(b/122876336): Remove libpac.so once it's migrated to Webview		# TODO(b/122876336): Remove libpac.so once it's migrated to Webview
	namespace.default.link.runtime.shared_libs += libpac.so		namespace.default.link.runtime.shared_libs += libpac.so

rootdir/etc/ld.config.txt

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -133,6 +133,9 @@ namespace.default.links = runtime,resolv
	# libart.		# libart.
	namespace.default.visible = true		namespace.default.visible = true
	namespace.default.link.runtime.shared_libs = libdexfile_external.so		namespace.default.link.runtime.shared_libs = libdexfile_external.so
			# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466
			namespace.default.link.runtime.shared_libs += libicui18n.so
			namespace.default.link.runtime.shared_libs += libicuuc.so
	namespace.default.link.runtime.shared_libs += libnativebridge.so		namespace.default.link.runtime.shared_libs += libnativebridge.so
	namespace.default.link.runtime.shared_libs += libnativehelper.so		namespace.default.link.runtime.shared_libs += libnativehelper.so
	namespace.default.link.runtime.shared_libs += libnativeloader.so		namespace.default.link.runtime.shared_libs += libnativeloader.so
	@@ -503,6 +506,9 @@ namespace.system.asan.search.paths += /%PRODUCT_SERVICES%/${LIB}

	namespace.system.links = runtime		namespace.system.links = runtime
	namespace.system.link.runtime.shared_libs = libdexfile_external.so		namespace.system.link.runtime.shared_libs = libdexfile_external.so
			# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466
			namespace.system.link.runtime.shared_libs += libicui18n.so
			namespace.system.link.runtime.shared_libs += libicuuc.so
	namespace.system.link.runtime.shared_libs += libnativebridge.so		namespace.system.link.runtime.shared_libs += libnativebridge.so
	namespace.system.link.runtime.shared_libs += libnativehelper.so		namespace.system.link.runtime.shared_libs += libnativehelper.so
	namespace.system.link.runtime.shared_libs += libnativeloader.so		namespace.system.link.runtime.shared_libs += libnativeloader.so
	@@ -579,6 +585,9 @@ namespace.default.links = runtime,resolv
	namespace.default.visible = true		namespace.default.visible = true

	namespace.default.link.runtime.shared_libs = libdexfile_external.so		namespace.default.link.runtime.shared_libs = libdexfile_external.so
			# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466
			namespace.default.link.runtime.shared_libs += libicui18n.so
			namespace.default.link.runtime.shared_libs += libicuuc.so
	namespace.default.link.runtime.shared_libs += libnativebridge.so		namespace.default.link.runtime.shared_libs += libnativebridge.so
	namespace.default.link.runtime.shared_libs += libnativehelper.so		namespace.default.link.runtime.shared_libs += libnativehelper.so
	namespace.default.link.runtime.shared_libs += libnativeloader.so		namespace.default.link.runtime.shared_libs += libnativeloader.so