Merge "Improve flakiness of PlatformCompatGating test" am: d500b8afd6 am: 8fabad25ca am: e0f9b5217a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icee6d1a99a04131552912b825df449bdb1eec615
This commit is contained in:
Andrei-Valentin Onea
2021-01-27 07:53:15 +00:00
committed by Automerger Merge Worker

View File

@@ -131,6 +131,10 @@ class PlatformCompatCommandNotInstalledTest {
assertThat(platformCompat.isChangeEnabled(TEST_CHANGE_ID, appInfo)).isEqualTo(params.result)
}
private fun command(command: String) =
FileReader(uiAutomation.executeShellCommand(command).fileDescriptor).readText()
private fun command(command: String): String {
val fileDescriptor = uiAutomation.executeShellCommand(command)
return String(ParcelFileDescriptor.AutoCloseInputStream(fileDescriptor).use {
inputStream -> inputStream.readBytes()
})
}
}