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

Commit c103d5c8 authored by Miguel Aranda's avatar Miguel Aranda Committed by Automerger Merge Worker
Browse files

Merge "Increase test timeout for failing expensiveobjects test." am:...

Merge "Increase test timeout for failing expensiveobjects test." am: 82af3a18 am: 4ee1296e am: 61a5da59

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



Change-Id: I2933c0f8c1cace0ec2e75011f33ff41630696ffb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3bb2767d 61a5da59
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class ExpensiveObjectsPerfTest {
        }
    }

    @Test
    @Test(timeout = 900)
    public void timeClonedDateFormatTimeInstance() {
        DateFormat df = DateFormat.getTimeInstance(DateFormat.SHORT);
        BenchmarkState state = mPerfStatusReporter.getBenchmarkState();