Snap for 5434517 from 20b0bd9ca4007ea96daaa27dcd48bc519a8fece1 to qt-release (ec3ff1b4) · Commits · e / os / android_system_core

adb/client/usb_osx.cpp

+1 −3

Original line number	Diff line number	Diff line
		@@ -557,9 +557,7 @@ int usb_close(usb_handle *handle)
		}

		void usb_reset(usb_handle* handle) {
		if (!handle->dead) {
		(*handle->interface)->USBDeviceReEnumerate(handle->interface, 0);
		}
		// Unimplemented on OS X.
		usb_kick(handle);
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@
		#define ATRACE_TAG ATRACE_TAG_BIONIC
		#include <utils/Trace.h>

		#include <unwindstack/DexFiles.h>
		#include <unwindstack/JitDebug.h>
		#include <unwindstack/Maps.h>
		#include <unwindstack/Memory.h>
		@@ -567,7 +566,7 @@ int main(int argc, char** argv) {

		// TODO: Use seccomp to lock ourselves down.
		unwindstack::UnwinderFromPid unwinder(256, vm_pid);
		if (!unwinder.Init(unwindstack::Regs::CurrentArch())) {
		if (!unwinder.Init()) {
		LOG(FATAL) << "Failed to init unwinder object.";
		}

+3 −4

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@
		#include <android-base/file.h>
		#include <android-base/unique_fd.h>
		#include <async_safe/log.h>
		#include <unwindstack/DexFiles.h>
		#include <unwindstack/JitDebug.h>
		#include <unwindstack/Maps.h>
		#include <unwindstack/Memory.h>
		@@ -81,12 +80,12 @@ static void debuggerd_fallback_trace(int output_fd, ucontext_t* ucontext) {
		thread.pid = getpid();
		thread.tid = gettid();
		thread.thread_name = get_thread_name(gettid());
		unwindstack::ArchEnum arch = unwindstack::Regs::CurrentArch();
		thread.registers.reset(unwindstack::Regs::CreateFromUcontext(arch, ucontext));
		thread.registers.reset(
		unwindstack::Regs::CreateFromUcontext(unwindstack::Regs::CurrentArch(), ucontext));

		// TODO: Create this once and store it in a global?
		unwindstack::UnwinderFromPid unwinder(kMaxFrames, getpid());
		if (unwinder.Init(arch)) {
		if (unwinder.Init()) {
		dump_backtrace_thread(output_fd, &unwinder, thread);
		} else {
		async_safe_format_log(ANDROID_LOG_ERROR, "libc", "Unable to init unwinder.");

+1 −2

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@
		#include <log/log.h>
		#include <log/logprint.h>
		#include <private/android_filesystem_config.h>
		#include <unwindstack/DexFiles.h>
		#include <unwindstack/JitDebug.h>
		#include <unwindstack/Maps.h>
		#include <unwindstack/Memory.h>
		@@ -650,7 +649,7 @@ void engrave_tombstone_ucontext(int tombstone_fd, uint64_t abort_msg_address, si
		};

		unwindstack::UnwinderFromPid unwinder(kMaxFrames, pid);
		if (!unwinder.Init(unwindstack::Regs::CurrentArch())) {
		if (!unwinder.Init()) {
		LOG(FATAL) << "Failed to init unwinder object.";
		}

+17 −1

Original line number	Diff line number	Diff line
		@@ -407,9 +407,25 @@ static bool IsFilePinned(int file_fd, const std::string& file_path, uint32_t fs_
		#define F2FS_IOC_GET_PIN_FILE _IOR(F2FS_IOCTL_MAGIC, 14, __u32)
		#endif

		// f2fs: export FS_NOCOW_FL flag to user
		uint32_t flags;
		int error = ioctl(file_fd, FS_IOC_GETFLAGS, &flags);
		if (error < 0) {
		if ((errno == ENOTTY) \|\| (errno == ENOTSUP)) {
		PLOG(ERROR) << "Failed to get flags, not supported by kernel: " << file_path;
		} else {
		PLOG(ERROR) << "Failed to get flags: " << file_path;
		}
		return false;
		}
		if (!(flags & FS_NOCOW_FL)) {
		LOG(ERROR) << "It is not pinned: " << file_path;
		return false;
		}

		// F2FS_IOC_GET_PIN_FILE returns the number of blocks moved.
		uint32_t moved_blocks_nr;
		int error = ioctl(file_fd, F2FS_IOC_GET_PIN_FILE, &moved_blocks_nr);
		error = ioctl(file_fd, F2FS_IOC_GET_PIN_FILE, &moved_blocks_nr);
		if (error < 0) {
		if ((errno == ENOTTY) \|\| (errno == ENOTSUP)) {
		PLOG(ERROR) << "Failed to get file pin status, not supported by kernel: " << file_path;