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

Commit b4993d01 authored by Christopher Ferris's avatar Christopher Ferris Committed by Automerger Merge Worker
Browse files

Merge "Update for v5.10 kernel headers." am: 20476761 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f553f69c24569f15fc43eb73d3823c26dc281ff
parents ab82d573 20476761

debuggerd/libdebuggerd/utility.cpp

+1 −3
Original line number Diff line number Diff line
@@ -370,14 +370,12 @@ const char* get_sigcode(const siginfo_t* si) { 
          return "SEGV_ADIDERR";

        case SEGV_ADIPERR:

          return "SEGV_ADIPERR";

#if defined(ANDROID_EXPERIMENTAL_MTE)

        case SEGV_MTEAERR:

          return "SEGV_MTEAERR";

        case SEGV_MTESERR:

          return "SEGV_MTESERR";

#endif

      }

      static_assert(NSIGSEGV == SEGV_ADIPERR, "missing SEGV_* si_code");

      static_assert(NSIGSEGV == SEGV_MTESERR, "missing SEGV_* si_code");

      break;

    case SIGSYS:

      switch (si->si_code) {

libappfuse/tests/FuseAppLoopTest.cc

+3 −3
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ TEST_F(FuseAppLoopTest, LookUp) { 
  EXPECT_EQ(0u, response_.entry_out.attr.gid);

  EXPECT_EQ(0u, response_.entry_out.attr.rdev);

  EXPECT_EQ(0u, response_.entry_out.attr.blksize);

  EXPECT_EQ(0u, response_.entry_out.attr.padding);

  EXPECT_EQ(0u, response_.entry_out.attr.flags);

}



TEST_F(FuseAppLoopTest, LookUp_InvalidName) {
@@ -226,7 +226,7 @@ TEST_F(FuseAppLoopTest, GetAttr) { 
  EXPECT_EQ(0u, response_.attr_out.attr.gid);

  EXPECT_EQ(0u, response_.attr_out.attr.rdev);

  EXPECT_EQ(0u, response_.attr_out.attr.blksize);

  EXPECT_EQ(0u, response_.attr_out.attr.padding);

  EXPECT_EQ(0u, response_.attr_out.attr.flags);

}



TEST_F(FuseAppLoopTest, GetAttr_Root) {
@@ -259,7 +259,7 @@ TEST_F(FuseAppLoopTest, GetAttr_Root) { 
  EXPECT_EQ(0u, response_.attr_out.attr.gid);

  EXPECT_EQ(0u, response_.attr_out.attr.rdev);

  EXPECT_EQ(0u, response_.attr_out.attr.blksize);

  EXPECT_EQ(0u, response_.attr_out.attr.padding);

  EXPECT_EQ(0u, response_.attr_out.attr.flags);

}



TEST_F(FuseAppLoopTest, Open) {