Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kohsuke Yatoh
2021-05-06 14:44:33 +00:00
committed by Android (Google) Code Review
parent 1a2a958df0 7a295f21b6
commit dc8bad21d6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/UpdatableSystemFontTest/src/com/android/updatablesystemfont/UpdatableSystemFontTest.java
View File

@@ -112,7 +112,8 @@ public class UpdatableSystemFontTest {
@After @After
public void tearDown() throws Exception { 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) { if (mKeyId != null) {
expectCommandToSucceed("mini-keyctl unlink " + mKeyId + " .fs-verity"); expectCommandToSucceed("mini-keyctl unlink " + mKeyId + " .fs-verity");
} }