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

Commit 93a28e91 authored by Ram Muthiah's avatar Ram Muthiah Committed by Automerger Merge Worker
Browse files

Merge "Remove display tests from presubmit." into sc-dev am: 4f7e0ecd 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b7ebe27b63e3f0fbd112f5062d791d07d69bf2f
parents b1b13220 4f7e0ecd

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

+0 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.hardware.SensorEventListener; 
import android.hardware.SensorManager;

import android.hardware.display.DisplayManagerInternal.DisplayPowerRequest;

import android.os.Handler;

import android.platform.test.annotations.Presubmit;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;
@@ -44,7 +43,6 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;



@SmallTest

@Presubmit

@RunWith(AndroidJUnit4.class)

public class AutomaticBrightnessControllerTest {

    private static final float BRIGHTNESS_MIN_FLOAT = 0.0f;

services/tests/servicestests/src/com/android/server/display/BrightnessMappingStrategyTest.java

+0 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.content.res.Resources; 
import android.content.res.TypedArray;

import android.hardware.display.BrightnessConfiguration;

import android.os.PowerManager;

import android.platform.test.annotations.Presubmit;

import android.util.MathUtils;

import android.util.Spline;
@@ -43,7 +42,6 @@ import org.junit.runner.RunWith; 
import java.util.Arrays;



@SmallTest

@Presubmit

@RunWith(AndroidJUnit4.class)

public class BrightnessMappingStrategyTest {

services/tests/servicestests/src/com/android/server/display/DisplayModeDirectorTest.java

+0 −2
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import android.hardware.SensorManager; 
import android.hardware.display.DisplayManager;

import android.os.Handler;

import android.os.Looper;

import android.platform.test.annotations.Presubmit;

import android.provider.DeviceConfig;

import android.provider.Settings;

import android.test.mock.MockContentResolver;
@@ -83,7 +82,6 @@ import java.util.concurrent.TimeUnit; 
import java.util.stream.Collectors;



@SmallTest

@Presubmit

@RunWith(AndroidJUnit4.class)

public class DisplayModeDirectorTest {

    // The tolerance within which we consider something approximately equals.

services/tests/servicestests/src/com/android/server/display/PersistentDataStoreTest.java

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertNull; 
import static org.junit.Assert.assertTrue;



import android.hardware.display.BrightnessConfiguration;

import android.platform.test.annotations.Presubmit;

import android.util.Pair;



import androidx.test.filters.SmallTest;
@@ -41,7 +40,6 @@ import java.io.OutputStream; 
import java.nio.charset.StandardCharsets;



@SmallTest

@Presubmit

@RunWith(AndroidJUnit4.class)

public class PersistentDataStoreTest {

    private PersistentDataStore mDataStore;