From 9e46feadb210301590416e637398d234103f604b Mon Sep 17 00:00:00 2001
From: Miguel <miguelaranda@google.com>
Date: Tue, 27 Jun 2023 15:38:36 +0000
Subject: [PATCH] Extend ExpensiveObjectsPerfTest timeouts.

Test: atest ExpensiveObjectsPerfTest
Bug: 284111560
Bug: 286219615
Change-Id: I6e35b65311c970e2c5ed40f5f25a9e771c35e9a2
---
 .../android/libcore/regression/ExpensiveObjectsPerfTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apct-tests/perftests/core/src/android/libcore/regression/ExpensiveObjectsPerfTest.java b/apct-tests/perftests/core/src/android/libcore/regression/ExpensiveObjectsPerfTest.java
index 3910a0827aad9..7712aeef41614 100644
--- a/apct-tests/perftests/core/src/android/libcore/regression/ExpensiveObjectsPerfTest.java
+++ b/apct-tests/perftests/core/src/android/libcore/regression/ExpensiveObjectsPerfTest.java
@@ -52,7 +52,7 @@ public class ExpensiveObjectsPerfTest {
         }
     }
 
-    @Test(timeout = 900)
+    @Test(timeout = 900000)
     public void timeClonedDateFormatTimeInstance() {
         DateFormat df = DateFormat.getTimeInstance(DateFormat.SHORT);
         BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
@@ -72,7 +72,7 @@ public class ExpensiveObjectsPerfTest {
         }
     }
 
-    @Test
+    @Test(timeout = 900000)
     public void timeNewCollator() {
         BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
         while (state.keepRunning()) {