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

Commit 861f7157 authored by Nick Desaulniers's avatar Nick Desaulniers Committed by android-build-merger
Browse files

Merge changes I8804f7dd,I3cbca589 

am: 0e9a0f98

Change-Id: I70744367cbef05811348835593d1ff5bce1f21d1
parents e7892efe 0e9a0f98

debuggerd/client/debuggerd_client.cpp

+4 −1
Original line number Diff line number Diff line
@@ -195,7 +195,10 @@ bool debuggerd_trigger_dump(pid_t tid, DebuggerdDumpType dump_type, unsigned int 
    return false;

  }



  InterceptRequest req = {.pid = pid, .dump_type = dump_type};

  InterceptRequest req = {

      .dump_type = dump_type,

      .pid = pid,

  };

  if (!set_timeout(sockfd)) {

    PLOG(ERROR) << "libdebugger_client: failed to set timeout";

    return false;

debuggerd/debuggerd_test.cpp

+4 −1
Original line number Diff line number Diff line
@@ -101,7 +101,10 @@ static void tombstoned_intercept(pid_t target_pid, unique_fd* intercept_fd, uniq 
    FAIL() << "failed to contact tombstoned: " << strerror(errno);

  }



  InterceptRequest req = {.pid = target_pid, .dump_type = intercept_type};

  InterceptRequest req = {

      .dump_type = intercept_type,

      .pid = target_pid,

  };



  unique_fd output_pipe_write;

  if (!Pipe(output_fd, &output_pipe_write)) {

debuggerd/handler/debuggerd_handler.cpp

+1 −1
Original line number Diff line number Diff line
@@ -525,8 +525,8 @@ static void debuggerd_signal_handler(int signal_number, siginfo_t* info, void* c 
  log_signal_summary(info);



  debugger_thread_info thread_info = {

      .pseudothread_tid = -1,

      .crashing_tid = __gettid(),

      .pseudothread_tid = -1,

      .siginfo = info,

      .ucontext = context,

      .abort_msg = reinterpret_cast<uintptr_t>(abort_message),

debuggerd/libdebuggerd/test/tombstone_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -345,9 +345,9 @@ TEST_F(TombstoneTest, dump_header_info) { 


TEST_F(TombstoneTest, dump_thread_info_uid) {

  dump_thread_info(&log_, ThreadInfo{.uid = 1,

                                     .pid = 2,

                                     .tid = 3,

                                     .thread_name = "some_thread",

                                     .pid = 2,

                                     .process_name = "some_process"});

  std::string expected = "pid: 2, tid: 3, name: some_thread  >>> some_process <<<\nuid: 1\n";

  ASSERT_STREQ(expected.c_str(), amfd_data_.c_str());

fs_mgr/fs_mgr_fstab.cpp

+3 −2
Original line number Diff line number Diff line
@@ -686,13 +686,14 @@ void TransformFstabForDsu(Fstab* fstab, const std::vector<std::string>& dsu_part 
        if (entries.empty()) {

            FstabEntry entry = {

                    .blk_device = partition,

                    // .logical_partition_name is required to look up AVB Hashtree descriptors.

                    .logical_partition_name = "system",

                    .mount_point = mount_point,

                    .fs_type = "ext4",

                    .flags = MS_RDONLY,

                    .fs_options = "barrier=1",

                    .avb_keys = kGsiKeys,

                    // .logical_partition_name is required to look up AVB Hashtree descriptors.

                    .logical_partition_name = "system"};

            };

            entry.fs_mgr_flags.wait = true;

            entry.fs_mgr_flags.logical = true;

            entry.fs_mgr_flags.first_stage_mount = true;