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 am: dc8bad21d6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14448847

Change-Id: I5596a3647b7687e1a679b9196eb2089955b229fd
This commit is contained in:
Kohsuke Yatoh
2021-05-06 14:44:58 +00:00
committed by Automerger Merge Worker
parent 033fc49ffc dc8bad21d6
commit f693b2c85e
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
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");
}