Merge "Update TestThread2 Stacktrace in align to OpenJDK 8u121-b13"

2020-01-27 15:56:57 +00:00
parent 35d3ce82d4 ae4c953f8e
commit 5360a52f6d
1 changed files with 2 additions and 0 deletions
--- 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 <HASH> (a java.lang.String)\n" +