From ae4c953f8e605403f3ced072dd5b3ac2558c9c90 Mon Sep 17 00:00:00 2001 From: Naga Venkata Durga Ashok Mutyala Date: Wed, 22 Jan 2020 18:44:07 +0530 Subject: [PATCH] Update TestThread2 Stacktrace in align to OpenJDK 8u121-b13 b/74379469 replaces native wait() method to wait(long timeout, long nanos) Bug: 148126143 Test: atest WatchdogDiagnosticsTest Change-Id: I8badf741d359d3282cb70be0410396cd91cda308 Signed-off-by: Naga Venkata Durga Ashok Mutyala --- .../src/com/android/server/WatchdogDiagnosticsTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/tests/servicestests/src/com/android/server/WatchdogDiagnosticsTest.java b/services/tests/servicestests/src/com/android/server/WatchdogDiagnosticsTest.java index 4d229efc83289..625766a97f133 100644 --- a/services/tests/servicestests/src/com/android/server/WatchdogDiagnosticsTest.java +++ b/services/tests/servicestests/src/com/android/server/WatchdogDiagnosticsTest.java @@ -157,6 +157,8 @@ public class WatchdogDiagnosticsTest { String expected = "TestThread2 annotated stack trace:\n" + " at java.lang.Object.wait(Native Method)\n" + + " at java.lang.Object.wait(Object.java:442)\n" + + " at java.lang.Object.wait(Object.java:568)\n" + " at com.android.server.WatchdogDiagnosticsTest$TestThread2.y(" + "WatchdogDiagnosticsTest.java:91)\n" + " - locked (a java.lang.String)\n" +