summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYan Han <yanha@google.com>2021-09-15 15:18:22 +0200
committerYan Han <yanha@google.com>2021-10-04 11:36:00 +0200
commit580909db4904aeedf10d4cf1a05d783e8d963df6 (patch)
tree8df607af453449ae496675ee9d096b80908cfed1
parent73a065a41f5ab51391f21f149eafa50dde341af1 (diff)
downloadbase-580909db4904aeedf10d4cf1a05d783e8d963df6.tar.gz
Round 3: Fix flakiness of testNativeCrash
Round 2: ag/15616233 Round 1: aosp/1702009 Even with increased timeouts, testNativeCrash is not always able to get the tombstone of the crashed native app. This is because the tombstone timestamp can be more than 1000ms before the ApplicationExitInfo, causing them to not match. See b/191798394 for more details. This CL increases the maximum timestamp difference to ensure that the tombstone (almost?) always matches. Bug: 192299487 Test: atest android.app.cts.ActivityManagerAppExitInfoTest Change-Id: Ideeb93dbcb40ce9d564f159fe1f7574554c09a40
-rw-r--r--services/core/java/com/android/server/os/NativeTombstoneManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/os/NativeTombstoneManager.java b/services/core/java/com/android/server/os/NativeTombstoneManager.java
index ed1f5f567d95..3fc416931a06 100644
--- a/services/core/java/com/android/server/os/NativeTombstoneManager.java
+++ b/services/core/java/com/android/server/os/NativeTombstoneManager.java
@@ -356,7 +356,7 @@ public final class NativeTombstoneManager {
return false;
}
- if (Math.abs(exitInfo.getTimestamp() - mTimestampMs) > 1000) {
+ if (Math.abs(exitInfo.getTimestamp() - mTimestampMs) > 5000) {
return false;
}