From f95c09e3f43114f2a5f9e0a612ae440697b0156e Mon Sep 17 00:00:00 2001 From: Siim Sammul Date: Fri, 23 Apr 2021 13:34:41 +0100 Subject: [PATCH] Enable binder latency collection from system_server for dogfood. Bug: 180584913 Test: code is unit tested Change-Id: I68ab7f3bfc3364505ab6005933c2dc92f6eb486e --- .../com/android/internal/os/BinderCallsStats.java | 2 +- .../android/internal/os/BinderCallsStatsTest.java | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/core/java/com/android/internal/os/BinderCallsStats.java b/core/java/com/android/internal/os/BinderCallsStats.java index 30a35367d6f51..7ecf69b0abae6 100644 --- a/core/java/com/android/internal/os/BinderCallsStats.java +++ b/core/java/com/android/internal/os/BinderCallsStats.java @@ -57,7 +57,7 @@ public class BinderCallsStats implements BinderInternal.Observer { public static final boolean DEFAULT_TRACK_SCREEN_INTERACTIVE = false; public static final boolean DEFAULT_TRACK_DIRECT_CALLING_UID = true; public static final boolean DEFAULT_IGNORE_BATTERY_STATUS = false; - public static final boolean DEFAULT_COLLECT_LATENCY_DATA = false; + public static final boolean DEFAULT_COLLECT_LATENCY_DATA = true; public static final int MAX_BINDER_CALL_STATS_COUNT_DEFAULT = 1500; private static final String DEBUG_ENTRY_PREFIX = "__DEBUG_"; diff --git a/core/tests/coretests/src/com/android/internal/os/BinderCallsStatsTest.java b/core/tests/coretests/src/com/android/internal/os/BinderCallsStatsTest.java index 78901683eca16..8c5e0fc8e6584 100644 --- a/core/tests/coretests/src/com/android/internal/os/BinderCallsStatsTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BinderCallsStatsTest.java @@ -938,17 +938,9 @@ public class BinderCallsStatsTest { } @Test - public void testLatencyCollectionDisabledByDefault() { + public void testLatencyCollectionEnabledByDefault() { TestBinderCallsStats bcs = new TestBinderCallsStats(); - assertEquals(false, bcs.getCollectLatencyData()); - - Binder binder = new Binder(); - CallSession callSession = bcs.callStarted(binder, 1, WORKSOURCE_UID); - bcs.time += 10; - bcs.elapsedTime += 20; - bcs.callEnded(callSession, REQUEST_SIZE, REPLY_SIZE, WORKSOURCE_UID); - - assertEquals(0, bcs.getLatencyObserver().getLatencyHistograms().size()); + assertEquals(true, bcs.getCollectLatencyData()); } private static class TestHandler extends Handler {