Merge "Fixes presubmit test flaky in dumpstate" (21474550) · Commits · e / os / platform_frameworks_native

cmds/dumpstate/tests/dumpstate_smoke_test.cpp

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -310,8 +310,12 @@ TEST_F(ZippedBugReportContentsTest, ContainsSomeFileSystemFiles) {
	// FS/proc/*/mountinfo size > 0		// FS/proc/*/mountinfo size > 0
	FileExists("FS/proc/1/mountinfo", 0U, 100000U);		FileExists("FS/proc/1/mountinfo", 0U, 100000U);

	// FS/data/misc/profiles/cur/0/*/primary.prof size > 0		// FS/data/misc/profiles/cur/0/*/primary.prof should exist. Also, since dumpstate only adds
	FileExists("FS/data/misc/profiles/cur/0/com.android.phone/primary.prof", 0U, 100000U);		// 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);
			}
	}		}

	/**		/**