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

Commit 231d24da authored by Jernej Virag's avatar Jernej Virag
Browse files

Fix unbalanced trace calls in DozeScreenBrightness

Bug: 418724776
Test: compiled code
Flag: EXEMPT bugfix
Change-Id: I55ff2e1db3879d3d0e1b495bfa81614a4680b632
parent a73c04e8
Loading
Loading
Loading
Loading
+6 −10
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@
package com.android.systemui.doze;

import static android.os.PowerManager.GO_TO_SLEEP_REASON_TIMEOUT;

import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP;

import android.annotation.Nullable;
@@ -33,12 +32,12 @@ import android.hardware.display.DisplayManager;
import android.os.Handler;
import android.os.PowerManager;
import android.os.SystemProperties;
import android.os.Trace;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.IndentingPrintWriter;
import android.view.Display;

import com.android.app.tracing.TraceUtils;
import com.android.internal.R;
import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.doze.dagger.BrightnessSensor;
@@ -57,6 +56,8 @@ import java.util.Optional;

import javax.inject.Inject;

import kotlin.Unit;

/**
 * Controls the screen brightness when dozing.
 */
@@ -194,18 +195,13 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi

    @Override
    public void onSensorChanged(SensorEvent event) {
        if (Trace.isEnabled()) {
            Trace.traceBegin(
                    Trace.TRACE_TAG_APP, "DozeScreenBrightness.onSensorChanged" + event.values[0]);
        }
        try {
        TraceUtils.trace(() -> "DozeScreenBrightness.onSensorChanged" + event.values[0], () -> {
            if (mRegistered) {
                mLastSensorValue = (int) event.values[0];
                updateBrightnessAndReady(false /* force */);
            }
        } finally {
            Trace.endSection();
        }
            return Unit.INSTANCE;
        });
    }

    public void updateBrightnessAndReady(boolean force) {