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

Commit 20476761 authored by Christopher Ferris's avatar Christopher Ferris Committed by Gerrit Code Review
Browse files

Merge "Update for v5.10 kernel headers."

parents a93ec546 6ddc2c56

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) {