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

Merge "Do not make a getThreadTimeMicro() call when it is not needed. This was accidentally changed with https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080830" into sc-dev am: 6c852aeabc

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15346904

Change-Id: I4f3f4020495a49c72c75d3937838845980c63a05
This commit is contained in:
Siim Sammul
2021-07-26 09:25:42 +00:00
committed by Automerger Merge Worker
parent f21a6499f8 6c852aeabc
commit 4f950d7975
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/os/BinderCallsStats.java
View File

@@ -220,8 +220,9 @@ public class BinderCallsStats implements BinderInternal.Observer {
public CallSession callStarted(Binder binder, int code, int workSourceUid) { public CallSession callStarted(Binder binder, int code, int workSourceUid) {
noteNativeThreadId(); noteNativeThreadId();
boolean collectCpu = canCollect();
// We always want to collect data for latency if it's enabled, regardless of device state. // We always want to collect data for latency if it's enabled, regardless of device state.
if (!mCollectLatencyData && !canCollect()) { if (!mCollectLatencyData && !collectCpu) {
return null; return null;
} }
@@ -233,7 +234,7 @@ public class BinderCallsStats implements BinderInternal.Observer {
s.timeStarted = -1; s.timeStarted = -1;
s.recordedCall = shouldRecordDetailedData(); s.recordedCall = shouldRecordDetailedData();
if (mRecordingAllTransactionsForUid || s.recordedCall) { if (collectCpu && (mRecordingAllTransactionsForUid || s.recordedCall)) {
s.cpuTimeStarted = getThreadTimeMicro(); s.cpuTimeStarted = getThreadTimeMicro();
s.timeStarted = getElapsedRealtimeMicro(); s.timeStarted = getElapsedRealtimeMicro();
} else if (mCollectLatencyData) { } else if (mCollectLatencyData) {