Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 364bf8a1 authored May 25, 2019 by android-build-team Robot

Snap for 5606075 from 9e28c544 to qt-c2f2-release

Change-Id: Ia8fb349d63a24ab2fd0b71a1e0b5f96791dffe93

parents 82fe74df 9e28c544

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,

init/property_service.cpp

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -883,8 +883,12 @@ void property_load_boot_defaults(bool load_debug_prop) {
	load_properties_from_file("/system/build.prop", nullptr, &properties);		load_properties_from_file("/system/build.prop", nullptr, &properties);
	load_properties_from_file("/vendor/default.prop", nullptr, &properties);		load_properties_from_file("/vendor/default.prop", nullptr, &properties);
	load_properties_from_file("/vendor/build.prop", nullptr, &properties);		load_properties_from_file("/vendor/build.prop", nullptr, &properties);
			if (SelinuxGetVendorAndroidVersion() >= __ANDROID_API_Q__) {
			load_properties_from_file("/odm/etc/build.prop", nullptr, &properties);
			} else {
	load_properties_from_file("/odm/default.prop", nullptr, &properties);		load_properties_from_file("/odm/default.prop", nullptr, &properties);
	load_properties_from_file("/odm/build.prop", nullptr, &properties);		load_properties_from_file("/odm/build.prop", nullptr, &properties);
			}
	load_properties_from_file("/product/build.prop", nullptr, &properties);		load_properties_from_file("/product/build.prop", nullptr, &properties);
	load_properties_from_file("/product_services/build.prop", nullptr, &properties);		load_properties_from_file("/product_services/build.prop", nullptr, &properties);
	load_properties_from_file("/factory/factory.prop", "ro.*", &properties);		load_properties_from_file("/factory/factory.prop", "ro.*", &properties);

libcutils/fs_config.cpp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -159,8 +159,9 @@ static const struct fs_path_config android_files[] = {
	{ 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest64/*" },		{ 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest64/*" },
	{ 00600, AID_ROOT, AID_ROOT, 0, "default.prop" }, // legacy		{ 00600, AID_ROOT, AID_ROOT, 0, "default.prop" }, // legacy
	{ 00600, AID_ROOT, AID_ROOT, 0, "system/etc/prop.default" },		{ 00600, AID_ROOT, AID_ROOT, 0, "system/etc/prop.default" },
	{ 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" },		{ 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" }, // legacy; only for P release
	{ 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" },		{ 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" }, // legacy; only for P release
			{ 00600, AID_ROOT, AID_ROOT, 0, "odm/etc/build.prop" },
	{ 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 },		{ 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 },
	{ 00444, AID_ROOT, AID_ROOT, 0, odm_conf_file + 1 },		{ 00444, AID_ROOT, AID_ROOT, 0, odm_conf_file + 1 },
	{ 00444, AID_ROOT, AID_ROOT, 0, oem_conf_dir + 1 },		{ 00444, AID_ROOT, AID_ROOT, 0, oem_conf_dir + 1 },

rootdir/init.rc

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -586,7 +586,6 @@ on post-fs-data
	symlink /data/data /data/user/0		symlink /data/data /data/user/0

	mkdir /data/media 0770 media_rw media_rw		mkdir /data/media 0770 media_rw media_rw
	mkdir /data/media/obb 0770 media_rw media_rw

	mkdir /data/cache 0770 system cache		mkdir /data/cache 0770 system cache
	mkdir /data/cache/recovery 0770 system cache		mkdir /data/cache/recovery 0770 system cache