Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add HW_TIMEOUT_MULTIPLIER to timeouts

Browse Source 
Test: SurfaceSyncGroupTests
Bug: 279141968
Change-Id: I31fb67887377cdfe29d99cc4fcb5d9aad3c4dd5d
This commit is contained in:
Chavi Weingarten
2023-04-21 18:43:06 +00:00
parent 269e417a53
commit c53786b584
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/tests/wmtests/src/com/android/server/wm/SurfaceSyncGroupTests.java
View File

@@ -16,6 +16,7 @@
package com.android.server.wm;
import static android.os.Build.HW_TIMEOUT_MULTIPLIER;
import static android.window.SurfaceSyncGroup.TRANSACTION_READY_TIMEOUT;
import static org.junit.Assert.assertEquals;
@@ -52,6 +53,8 @@ import java.util.concurrent.TimeUnit;
public class SurfaceSyncGroupTests {
private static final String TAG = "SurfaceSyncGroupTests";
private static final long TIMEOUT_S = HW_TIMEOUT_MULTIPLIER * 5L;
@Rule
public ActivityTestRule<SurfaceSyncGroupActivity> mActivityRule = new ActivityTestRule<>(
SurfaceSyncGroupActivity.class);
@@ -93,7 +96,7 @@ public class SurfaceSyncGroupTests {
addSecondSyncGroup(secondSsg, secondDrawCompleteLatch, bothSyncGroupsComplete);
assertTrue("Failed to draw two frames",
secondDrawCompleteLatch.await(5, TimeUnit.SECONDS));
secondDrawCompleteLatch.await(TIMEOUT_S, TimeUnit.SECONDS));
mHandler.postDelayed(() -> {
// Don't add a markSyncReady for the first sync group until after it's added to another
@@ -105,7 +108,7 @@ public class SurfaceSyncGroupTests {
}, 200);
assertTrue("Failed to wait for both SurfaceSyncGroups to apply",
bothSyncGroupsComplete.await(5, TimeUnit.SECONDS));
bothSyncGroupsComplete.await(TIMEOUT_S, TimeUnit.SECONDS));
validateScreenshot();
}
@@ -123,7 +126,7 @@ public class SurfaceSyncGroupTests {
transaction -> mHandler.postDelayed(() -> {
try {
assertTrue("Failed to draw two frames",
secondDrawCompleteLatch.await(5, TimeUnit.SECONDS));
secondDrawCompleteLatch.await(TIMEOUT_S, TimeUnit.SECONDS));
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
@@ -143,7 +146,7 @@ public class SurfaceSyncGroupTests {
addSecondSyncGroup(secondSsg, secondDrawCompleteLatch, bothSyncGroupsComplete);
assertTrue("Failed to wait for both SurfaceSyncGroups to apply",
bothSyncGroupsComplete.await(5, TimeUnit.SECONDS));
bothSyncGroupsComplete.await(TIMEOUT_S, TimeUnit.SECONDS));
validateScreenshot();
}