diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-05 09:29:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-05 09:29:03 +0000 |
| commit | ccf3cedda82cce471196896dafc8f78383782a14 (patch) | |
| tree | 2fe8970d3c5c64394b60e22ca80a4f6e3a710cc5 | |
| parent | 0f423ebc5e336b922fe88ea7941c8d8fc2330402 (diff) | |
| parent | 5757f89ddc251b4df884c4f25abf0e721fccbbf5 (diff) | |
| download | base-ccf3cedda82cce471196896dafc8f78383782a14.tar.gz | |
Merge "Round 3: Fix flakiness of testNativeCrash" am: 5757f89ddc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1843421
Change-Id: I5b7038ac40d723829606c8d0a76903ad104cb94b
| -rw-r--r-- | services/core/java/com/android/server/os/NativeTombstoneManager.java | 2 |
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; } |