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

Commit cada40a7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "fix(non linear font scaling): optimize test to reduce flaky timeouts"... 

Merge "fix(non linear font scaling): optimize test to reduce flaky timeouts" into udc-dev am: d2e529d3

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



Change-Id: Ie6e5f6e43346afc619034f99df6167f59282e980
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0249d659 d2e529d3

core/tests/coretests/src/android/content/res/FontScaleConverterFactoryTest.kt

+1 −5
Original line number Diff line number Diff line
@@ -90,11 +90,7 @@ class FontScaleConverterFactoryTest { 
            }

            .forEach { (table, sp) ->

                try {

                    assertWithMessage(

                        "convertSpToDp(%s) on table: %s",

                        sp.toString(),

                        table.toString()

                    )

                    assertWithMessage("convertSpToDp(%s) on table: %s", sp, table)

                        .that(table.convertSpToDp(sp))

                        .isFinite()

                } catch (e: Exception) {