Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update TestThread2 Stacktrace in align to OpenJDK 8u121-b13" am: 5360a52f6d am: a8e11be07f

Browse Source 
Change-Id: I96e5b25e62f350dec5865fe418b878bc1bc6b1c7
This commit is contained in:
Automerger Merge Worker
2020-01-27 17:20:54 +00:00
parent e56d164d1a a8e11be07f
commit 390883751b
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/tests/servicestests/src/com/android/server/WatchdogDiagnosticsTest.java
View File

@@ -157,6 +157,8 @@ public class WatchdogDiagnosticsTest {
String expected = String expected =
"TestThread2 annotated stack trace:\n" + "TestThread2 annotated stack trace:\n" +
" at java.lang.Object.wait(Native Method)\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(" + " at com.android.server.WatchdogDiagnosticsTest$TestThread2.y(" +
"WatchdogDiagnosticsTest.java:91)\n" + "WatchdogDiagnosticsTest.java:91)\n" +
" - locked <HASH> (a java.lang.String)\n" + " - locked <HASH> (a java.lang.String)\n" +