Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bba5f4e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "Update TestThread2 Stacktrace in align to OpenJDK 8u121-b13" am: 5360a52f am: a8e11be0 am: 39088375

Change-Id: I35074f37b29f8c1987c01cdf5bff5d65ab6d5131
parents 098a1baa 39088375

services/tests/servicestests/src/com/android/server/WatchdogDiagnosticsTest.java

+2 −0
Original line number Diff line number Diff line
@@ -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" +