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

Commit 353100b4 authored by Rhed Jao's avatar Rhed Jao Committed by Automerger Merge Worker
Browse files

Merge "Fixes presubmit test flaky in dumpstate" am: 21474550 am: 8ded8f51... 

Merge "Fixes presubmit test flaky in dumpstate" am: 21474550 am: 8ded8f51 am: 1dba361c am: 65a3e173 am: 89fc6eb8

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1560494

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa28b810605b770f2927a182ab770b5e577d9d55
parents 9012012b 89fc6eb8

cmds/dumpstate/tests/dumpstate_smoke_test.cpp

+6 −2
Original line number Diff line number Diff line
@@ -310,8 +310,12 @@ TEST_F(ZippedBugReportContentsTest, ContainsSomeFileSystemFiles) { 
    // FS/proc/*/mountinfo size > 0

    FileExists("FS/proc/1/mountinfo", 0U, 100000U);



    // FS/data/misc/profiles/cur/0/*/primary.prof size > 0

    FileExists("FS/data/misc/profiles/cur/0/com.android.phone/primary.prof", 0U, 100000U);

    // FS/data/misc/profiles/cur/0/*/primary.prof should exist. Also, since dumpstate only adds

    // profiles to the zip in the non-user build, a build checking is necessary here.

    if (!PropertiesHelper::IsUserBuild()) {

        ZipEntry entry;

        GetEntry(handle, "FS/data/misc/profiles/cur/0/com.android.phone/primary.prof", &entry);

    }

}



/**