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

Commit b5413bdf authored by Lee Shombert's avatar Lee Shombert Committed by Android (Google) Code Review
Browse files

Merge "Fix the testDumpOutput presubmit test" into main

parents 2af83996 c471c53e

services/core/java/com/android/server/utils/AnrTimer.java

+1 −1
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ public class AnrTimer<V> implements AutoCloseable { 
     * Return true if the native timers are supported.  Native timers are supported if the method

     * nativeAnrTimerSupported() can be executed and it returns true.

     */

    private static boolean nativeTimersSupported() {

    public static boolean nativeTimersSupported() {

        try {

            return nativeAnrTimerSupported();

        } catch (java.lang.UnsatisfiedLinkError e) {

services/tests/servicestests/src/com/android/server/utils/AnrTimerTest.java

+3 −1
Original line number Diff line number Diff line
@@ -312,10 +312,12 @@ public class AnrTimerTest { 
    }



    /**

     * Verify the dump output.

     * Verify the dump output.  This only applies when native timers are supported.

     */

    @Test

    public void testDumpOutput() throws Exception {

        if (!AnrTimer.nativeTimersSupported()) return;



        String r1 = getDumpOutput();

        assertThat(r1).doesNotContain("timer:");