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

Commit 6af194a0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "debuggerd: Use libprocessgroup to unfreeze" into main am: 58e219c1 am: 6a734e6b 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3395660



Change-Id: I47ae7e388f0665f2637501f7d6a06980c1cab402
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a7f3ec3e 6a734e6b

debuggerd/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -505,6 +505,7 @@ cc_binary { 
        "libbase",

        "libdebuggerd_client",

        "liblog",

        "libprocessgroup",

        "libprocinfo",

    ],

debuggerd/debuggerd.cpp

+3 −8
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ 
#include <string_view>

#include <thread>



#include <android-base/file.h>

#include <android-base/logging.h>

#include <android-base/parseint.h>

#include <android-base/unique_fd.h>

#include <debuggerd/client.h>

#include <processgroup/processgroup.h>

#include <procinfo/process.h>

#include "util.h"
@@ -92,13 +92,8 @@ int main(int argc, char* argv[]) { 
  }



  // unfreeze if pid is frozen.

  const std::string freeze_file = android::base::StringPrintf(

      "/sys/fs/cgroup/uid_%d/pid_%d/cgroup.freeze", proc_info.uid, proc_info.pid);

  if (std::string freeze_status;

      android::base::ReadFileToString(freeze_file, &freeze_status) && freeze_status[0] == '1') {

    android::base::WriteStringToFile("0", freeze_file);

  SetProcessProfiles(proc_info.uid, proc_info.pid, {"Unfrozen"});

  // we don't restore the frozen state as this is considered a benign change.

  }



  unique_fd output_fd(fcntl(STDOUT_FILENO, F_DUPFD_CLOEXEC, 0));

  if (output_fd.get() == -1) {