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

Commit b199448e authored by Rupesh Bansal's avatar Rupesh Bansal Committed by Android (Google) Code Review
Browse files

Merge "Removing the DEBUG flag check while logging traces"

parents b9cd74ab 0e0eb14d

services/core/java/com/android/server/display/DisplayDeviceRepository.java

+3 −2
Original line number Diff line number Diff line
@@ -167,7 +167,8 @@ class DisplayDeviceRepository implements DisplayAdapter.Listener { 
                return;

            }

            if (DEBUG) {

                Trace.beginSection("handleDisplayDeviceChanged");

                Trace.traceBegin(Trace.TRACE_TAG_POWER,

                        "handleDisplayDeviceChanged");

            }

            int diff = device.mDebugLastLoggedDeviceInfo.diff(info);

            if (diff == DisplayDeviceInfo.DIFF_STATE) {
@@ -189,7 +190,7 @@ class DisplayDeviceRepository implements DisplayAdapter.Listener { 
            device.applyPendingDisplayDeviceInfoChangesLocked();

            sendEventLocked(device, DISPLAY_DEVICE_EVENT_CHANGED);

            if (DEBUG) {

                Trace.endSection();

                Trace.traceEnd(Trace.TRACE_TAG_POWER);

            }

        }

    }

services/core/java/com/android/server/display/DisplayPowerController.java

+3 −6
Original line number Diff line number Diff line
@@ -1172,13 +1172,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
    }



    private void updatePowerState() {

        if (DEBUG) {

            Trace.beginSection("DisplayPowerController#updatePowerState");

        }

        Trace.traceBegin(Trace.TRACE_TAG_POWER,

                "DisplayPowerController#updatePowerState");

        updatePowerStateInternal();

        if (DEBUG) {

            Trace.endSection();

        }

        Trace.traceEnd(Trace.TRACE_TAG_POWER);

    }



    private void updatePowerStateInternal() {

services/core/java/com/android/server/display/DisplayPowerController2.java

+3 −6
Original line number Diff line number Diff line
@@ -1172,13 +1172,10 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
    }



    private void updatePowerState() {

        if (DEBUG) {

            Trace.beginSection("DisplayPowerController#updatePowerState");

        }

        Trace.traceBegin(Trace.TRACE_TAG_POWER,

                "DisplayPowerController#updatePowerState");

        updatePowerStateInternal();

        if (DEBUG) {

            Trace.endSection();

        }

        Trace.traceEnd(Trace.TRACE_TAG_POWER);

    }



    private void updatePowerStateInternal() {