Merge "Ignore 'cmd font clear' failure in tearDown()." into sc-dev

This commit is contained in:
Kohsuke Yatoh
2021-05-06 14:44:33 +00:00
committed by Android (Google) Code Review

View File

@@ -112,7 +112,8 @@ public class UpdatableSystemFontTest {
@After
public void tearDown() throws Exception {
expectCommandToSucceed("cmd font clear");
// Ignore errors because this may fail if updatable system font is not enabled.
runShellCommand("cmd font clear", null);
if (mKeyId != null) {
expectCommandToSucceed("mini-keyctl unlink " + mKeyId + " .fs-verity");
}