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

Commit 6c852aea authored by Siim Sammul's avatar Siim Sammul Committed by Android (Google) Code Review
Browse files

Merge "Do not make a getThreadTimeMicro() call when it is not needed. This was... 

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
parents 8e31f85e 8f31e9d6

core/java/com/android/internal/os/BinderCallsStats.java

+3 −2
Original line number Diff line number Diff line
@@ -220,8 +220,9 @@ public class BinderCallsStats implements BinderInternal.Observer { 
    public CallSession callStarted(Binder binder, int code, int workSourceUid) {

        noteNativeThreadId();



        boolean collectCpu = canCollect();

        // We always want to collect data for latency if it's enabled, regardless of device state.

        if (!mCollectLatencyData && !canCollect()) {

        if (!mCollectLatencyData && !collectCpu) {

            return null;

        }
@@ -233,7 +234,7 @@ public class BinderCallsStats implements BinderInternal.Observer { 
        s.timeStarted = -1;

        s.recordedCall = shouldRecordDetailedData();



        if (mRecordingAllTransactionsForUid || s.recordedCall) {

        if (collectCpu && (mRecordingAllTransactionsForUid || s.recordedCall)) {

            s.cpuTimeStarted = getThreadTimeMicro();

            s.timeStarted = getElapsedRealtimeMicro();

        } else if (mCollectLatencyData) {