Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f693b2c8 authored by Kohsuke Yatoh's avatar Kohsuke Yatoh Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I5596a3647b7687e1a679b9196eb2089955b229fd
parents 033fc49f dc8bad21

tests/UpdatableSystemFontTest/src/com/android/updatablesystemfont/UpdatableSystemFontTest.java

+2 −1
Original line number Diff line number Diff line
@@ -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");

        }