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

Commit 2ab891ff authored by Danae Savvidi's avatar Danae Savvidi Committed by Android (Google) Code Review
Browse files

Merge "Consolidate uses of EPSILON in DisplayPower" into main

parents 44b67130 4bb17da3

services/tests/displayservicetests/src/com/android/server/display/AutomaticBrightnessControllerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import androidx.test.InstrumentationRegistry; 
import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.internal.display.BrightnessSynchronizer;

import com.android.server.display.brightness.clamper.BrightnessClamperController;

import com.android.server.display.config.HysteresisLevels;

import com.android.server.display.feature.DisplayManagerFlags;
@@ -86,7 +87,7 @@ public class AutomaticBrightnessControllerTest { 
    private static final int LIGHT_SENSOR_WARMUP_TIME = 0;

    private static final int AMBIENT_LIGHT_HORIZON_SHORT = 1000;

    private static final int AMBIENT_LIGHT_HORIZON_LONG = 2000;

    private static final float EPSILON = 0.001f;

    private static final float EPSILON = BrightnessSynchronizer.EPSILON;

    private OffsettableClock mClock = new OffsettableClock();

    private TestLooper mTestLooper;

    private Context mContext;

services/tests/displayservicetests/src/com/android/server/display/BrightnessSynchronizerTest.java

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ import org.mockito.MockitoAnnotations; 
@SmallTest

@RunWith(TestParameterInjector.class)

public class BrightnessSynchronizerTest {

    private static final float EPSILON = 0.00001f;

    private static final Uri BRIGHTNESS_URI =

            Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS);

    private static final float BRIGHTNESS_MAX = 0.6f;

services/tests/displayservicetests/src/com/android/server/display/HighBrightnessModeControllerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import androidx.test.core.app.ApplicationProvider; 
import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.internal.display.BrightnessSynchronizer;

import com.android.internal.util.FrameworkStatsLog;

import com.android.internal.util.test.FakeSettingsProvider;

import com.android.internal.util.test.FakeSettingsProviderRule;
@@ -84,7 +85,7 @@ public class HighBrightnessModeControllerTest { 
    private static final int DISPLAY_WIDTH = 900;

    private static final int DISPLAY_HEIGHT = 1600;



    private static final float EPSILON = 0.000001f;

    private static final float EPSILON = BrightnessSynchronizer.EPSILON;



    private OffsettableClock mClock;

    private TestLooper mTestLooper;