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

Commit 7574d156 authored by Kweku Adams's avatar Kweku Adams Committed by android-build-merger
Browse files

Merge "Treating all FileSection files as device specific." 

am: db2353c1

Change-Id: Ifc8d046ada24e83b6f68d56747e96c3d2db6f3e8
parents 89203867 db2353c1

cmds/incidentd/src/Section.cpp

+3 −1
Original line number Diff line number Diff line
@@ -255,7 +255,9 @@ status_t FileSection::Execute(ReportRequestSet* requests) const { 
    unique_fd fd(open(mFilename, O_RDONLY | O_CLOEXEC));

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

        ALOGW("FileSection '%s' failed to open file", this->name.string());

        return this->deviceSpecific ? NO_ERROR : -errno;

        // There may be some devices/architectures that won't have the file.

        // Just return here without an error.

        return NO_ERROR;

    }



    FdBuffer buffer;

cmds/incidentd/tests/Section_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ TEST_F(SectionTest, FileSection) { 


TEST_F(SectionTest, FileSectionNotExist) {

    FileSection fs1(NOOP_PARSER, "notexist", false, QUICK_TIMEOUT_MS);

    ASSERT_EQ(NAME_NOT_FOUND, fs1.Execute(&requests));

    ASSERT_EQ(NO_ERROR, fs1.Execute(&requests));



    FileSection fs2(NOOP_PARSER, "notexist", true, QUICK_TIMEOUT_MS);

    ASSERT_EQ(NO_ERROR, fs2.Execute(&requests));