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

Commit ca8fb985 authored by Oleg Petšjonkin's avatar Oleg Petšjonkin Committed by Android (Google) Code Review
Browse files

Merge "Sensor and SensorEvent should be constructed using public constuctors" into main

parents 45e24974 d25d3f40

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

+61 −59
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import static com.android.server.display.AutomaticBrightnessController.AUTO_BRIG 
import static com.android.server.display.AutomaticBrightnessController.AUTO_BRIGHTNESS_MODE_DEFAULT;

import static com.android.server.display.AutomaticBrightnessController.AUTO_BRIGHTNESS_MODE_DOZE;

import static com.android.server.display.AutomaticBrightnessController.AUTO_BRIGHTNESS_MODE_IDLE;

import static com.android.server.display.TestUtilsKt.createSensor;

import static com.android.server.display.TestUtilsKt.createSensorEvent;



import static org.junit.Assert.assertArrayEquals;

import static org.junit.Assert.assertEquals;
@@ -49,8 +51,8 @@ import android.util.SparseArray; 
import android.view.Display;



import androidx.test.InstrumentationRegistry;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



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

import com.android.server.display.config.HysteresisLevels;
@@ -112,7 +114,7 @@ public class AutomaticBrightnessControllerTest { 
        System.setProperty("dexmaker.share_classloader", "true");

        MockitoAnnotations.initMocks(this);



        mLightSensor = TestUtils.createSensor(Sensor.TYPE_LIGHT, "Light Sensor");

        mLightSensor = createSensor(Sensor.TYPE_LIGHT, "Light Sensor");

        mContext = InstrumentationRegistry.getContext();

        setupController(BrightnessMappingStrategy.INVALID_LUX,

                BrightnessMappingStrategy.INVALID_NITS, /* applyDebounce= */ false,
@@ -225,7 +227,7 @@ public class AutomaticBrightnessControllerTest { 
                .thenReturn(1.0f);



        // Send new sensor value and verify

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, (int) lux1));

        listener.onSensorChanged(createSensorEvent(mLightSensor, (int) lux1));

        assertEquals(normalizedBrightness1, mController.getAutomaticScreenBrightness(), EPSILON);



        // Set up system to return 0.0f (minimum possible brightness) as a brightness value
@@ -239,7 +241,7 @@ public class AutomaticBrightnessControllerTest { 
                .thenReturn(normalizedBrightness2);



        // Send new sensor value and verify

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, (int) lux2));

        listener.onSensorChanged(createSensorEvent(mLightSensor, (int) lux2));

        assertEquals(normalizedBrightness2, mController.getAutomaticScreenBrightness(), EPSILON);

    }
@@ -268,7 +270,7 @@ public class AutomaticBrightnessControllerTest { 
                .thenReturn(1.1f);



        // Send new sensor value and verify

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, (int) lux1));

        listener.onSensorChanged(createSensorEvent(mLightSensor, lux1));

        assertEquals(normalizedBrightness1, mController.getAutomaticScreenBrightness(), EPSILON);
@@ -283,7 +285,7 @@ public class AutomaticBrightnessControllerTest { 
                .thenReturn(normalizedBrightness2);



        // Send new sensor value and verify

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, (int) lux2));

        listener.onSensorChanged(createSensorEvent(mLightSensor, lux2));

        assertEquals(normalizedBrightness2, mController.getAutomaticScreenBrightness(), EPSILON);

    }
@@ -296,7 +298,7 @@ public class AutomaticBrightnessControllerTest { 
        SensorEventListener listener = listenerCaptor.getValue();



        // Sensor reads 1000 lux,

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 1000));

        listener.onSensorChanged(createSensorEvent(mLightSensor, 1000));



        // User sets brightness to 100

        mController.configure(AUTO_BRIGHTNESS_ENABLED, null /* configuration= */,
@@ -318,7 +320,7 @@ public class AutomaticBrightnessControllerTest { 
        verify(mSensorManager).registerListener(listenerCaptor.capture(), eq(mLightSensor),

                eq(INITIAL_LIGHT_SENSOR_RATE * 1000), any(Handler.class));

        SensorEventListener listener = listenerCaptor.getValue();

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, currentLux));

        listener.onSensorChanged(createSensorEvent(mLightSensor, currentLux));



        // User sets brightness to 0.5f

        when(mBrightnessMappingStrategy.getBrightness(currentLux,
@@ -355,7 +357,7 @@ public class AutomaticBrightnessControllerTest { 
        SensorEventListener listener = listenerCaptor.getValue();



        // Sensor reads 123 lux,

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 123));

        listener.onSensorChanged(createSensorEvent(mLightSensor, 123));

        // User sets brightness to 100

        mController.configure(AUTO_BRIGHTNESS_ENABLED, /* configuration= */ null,

                /* brightness= */ 0.5f, /* userChangedBrightness= */ true, /* adjustment= */ 0,
@@ -369,7 +371,7 @@ public class AutomaticBrightnessControllerTest { 
                123f, 0.5f)).thenReturn(true);



        // Sensor reads 1000 lux,

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 1000));

        listener.onSensorChanged(createSensorEvent(mLightSensor, 1000));

        mTestLooper.moveTimeForward(

                mBrightnessMappingStrategy.getShortTermModelTimeout() + 1000);

        mTestLooper.dispatchAll();
@@ -395,7 +397,7 @@ public class AutomaticBrightnessControllerTest { 
        SensorEventListener listener = listenerCaptor.getValue();



        // Sensor reads 123 lux,

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 123));

        listener.onSensorChanged(createSensorEvent(mLightSensor, 123));

        // User sets brightness to 100

        mController.configure(AUTO_BRIGHTNESS_ENABLED, null /* configuration= */,

                0.51f /* brightness= */, true /* userChangedBrightness= */, 0 /* adjustment= */,
@@ -414,7 +416,7 @@ public class AutomaticBrightnessControllerTest { 
        mTestLooper.dispatchAll();



        // Sensor reads 100000 lux,

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 678910));

        listener.onSensorChanged(createSensorEvent(mLightSensor, 678910));

        mController.switchMode(AUTO_BRIGHTNESS_MODE_DEFAULT, /* sendUpdate= */ true);



        // Verify short term model is not reset.
@@ -435,7 +437,7 @@ public class AutomaticBrightnessControllerTest { 
        SensorEventListener listener = listenerCaptor.getValue();



        // Sensor reads 123 lux,

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 123));

        listener.onSensorChanged(createSensorEvent(mLightSensor, 123));

        // User sets brightness to 100

        mController.configure(AUTO_BRIGHTNESS_ENABLED, /* configuration= */ null,

                /* brightness= */ 0.5f, /* userChangedBrightness= */ true, /* adjustment= */ 0,
@@ -455,7 +457,7 @@ public class AutomaticBrightnessControllerTest { 
                123f, 0.5f)).thenReturn(true);



        // Sensor reads 1000 lux,

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 1000));

        listener.onSensorChanged(createSensorEvent(mLightSensor, 1000));

        mTestLooper.moveTimeForward(

                mBrightnessMappingStrategy.getShortTermModelTimeout() + 1000);

        mTestLooper.dispatchAll();
@@ -481,7 +483,7 @@ public class AutomaticBrightnessControllerTest { 
        SensorEventListener listener = listenerCaptor.getValue();



        // Sensor reads 123 lux,

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 123));

        listener.onSensorChanged(createSensorEvent(mLightSensor, 123));

        // User sets brightness to 100

        mController.configure(AUTO_BRIGHTNESS_ENABLED, /* configuration= */ null,

                /* brightness= */ 0.5f, /* userChangedBrightness= */ true, /* adjustment= */ 0,
@@ -503,7 +505,7 @@ public class AutomaticBrightnessControllerTest { 
                123f, 0.5f)).thenReturn(true);



        // Sensor reads 1000 lux,

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 1000));

        listener.onSensorChanged(createSensorEvent(mLightSensor, 1000));

        // Do not fast-forward time.

        mTestLooper.dispatchAll();
@@ -528,7 +530,7 @@ public class AutomaticBrightnessControllerTest { 
        SensorEventListener listener = listenerCaptor.getValue();



        // Sensor reads 123 lux,

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 123));

        listener.onSensorChanged(createSensorEvent(mLightSensor, 123));

        when(mBrightnessMappingStrategy.getShortTermModelTimeout()).thenReturn(2000L);

        when(mBrightnessMappingStrategy.getUserBrightness()).thenReturn(

                PowerManager.BRIGHTNESS_INVALID_FLOAT);
@@ -544,7 +546,7 @@ public class AutomaticBrightnessControllerTest { 
                BrightnessMappingStrategy.INVALID_LUX);



        // Sensor reads 1000 lux,

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 1000));

        listener.onSensorChanged(createSensorEvent(mLightSensor, 1000));

        // Do not fast-forward time.

        mTestLooper.dispatchAll();
@@ -567,7 +569,7 @@ public class AutomaticBrightnessControllerTest { 
        SensorEventListener listener = listenerCaptor.getValue();



        // Sensor reads 1000 lux,

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 1000));

        listener.onSensorChanged(createSensorEvent(mLightSensor, 1000));



        // User sets brightness to 100

        mController.configure(AUTO_BRIGHTNESS_ENABLED, null /* configuration= */,
@@ -619,37 +621,37 @@ public class AutomaticBrightnessControllerTest { 
        long increment = 500;

        // set autobrightness to low

        // t = 0

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 0,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 0,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));



        // t = 500

        mClock.fastForward(increment);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 0,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 0,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));



        // t = 1000

        mClock.fastForward(increment);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 0,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 0,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(0.0f, mController.getAmbientLux(), EPSILON);



        // t = 1500

        mClock.fastForward(increment);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 0,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 0,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(0.0f, mController.getAmbientLux(), EPSILON);



        // t = 2000

        // ensure that our reading is at 0.

        mClock.fastForward(increment);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 0,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 0,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(0.0f, mController.getAmbientLux(), EPSILON);



        // t = 2500

        // first 10000 lux sensor event reading

        mClock.fastForward(increment);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 10000,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 10000,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertTrue(mController.getAmbientLux() > 0.0f);

        assertTrue(mController.getAmbientLux() < 10000.0f);
@@ -657,7 +659,7 @@ public class AutomaticBrightnessControllerTest { 
        // t = 3000

        // lux reading should still not yet be 10000.

        mClock.fastForward(increment);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 10000,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 10000,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertTrue(mController.getAmbientLux() > 0.0f);

        assertTrue(mController.getAmbientLux() < 10000.0f);
@@ -667,14 +669,14 @@ public class AutomaticBrightnessControllerTest { 
        // lux has been high (10000) for 1000ms.

        // lux reading should be 10000

        // short horizon (ambient lux) is high, long horizon is still not high

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 10000,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 10000,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(10000.0f, mController.getAmbientLux(), EPSILON);



        // t = 4000

        // stay high

        mClock.fastForward(increment);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 10000,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 10000,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(10000.0f, mController.getAmbientLux(), EPSILON);
@@ -682,21 +684,21 @@ public class AutomaticBrightnessControllerTest { 
        Mockito.clearInvocations(mBrightnessMappingStrategy);

        mClock.fastForward(increment);

        // short horizon is high, long horizon is high too

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 10000,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 10000,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        verify(mBrightnessMappingStrategy, times(1)).getBrightness(10000, null, -1);

        assertEquals(10000.0f, mController.getAmbientLux(), EPSILON);



        // t = 5000

        mClock.fastForward(increment);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 0,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 0,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertTrue(mController.getAmbientLux() > 0.0f);

        assertTrue(mController.getAmbientLux() < 10000.0f);



        // t = 5500

        mClock.fastForward(increment);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 0,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 0,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertTrue(mController.getAmbientLux() > 0.0f);

        assertTrue(mController.getAmbientLux() < 10000.0f);
@@ -704,7 +706,7 @@ public class AutomaticBrightnessControllerTest { 
        // t = 6000

        mClock.fastForward(increment);

        // ambient lux goes to 0

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 0,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 0,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(0.0f, mController.getAmbientLux(), EPSILON);
@@ -766,7 +768,7 @@ public class AutomaticBrightnessControllerTest { 
                .thenReturn(normalizedBrightness);



        // Sensor reads 100 lux. We should get max brightness.

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, (int) lux));

        listener.onSensorChanged(createSensorEvent(mLightSensor, (int) lux));

        assertEquals(BRIGHTNESS_MAX_FLOAT, mController.getAutomaticScreenBrightness(), 0.0f);

        assertEquals(BRIGHTNESS_MAX_FLOAT, mController.getRawAutomaticScreenBrightness(), 0.0f);
@@ -809,7 +811,7 @@ public class AutomaticBrightnessControllerTest { 
        for (int i = 0; i < 1000; i++) {

            lux += increment;

            mClock.fastForward(increment);

            listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, lux,

            listener.onSensorChanged(createSensorEvent(mLightSensor, lux,

                    (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        }
@@ -847,12 +849,12 @@ public class AutomaticBrightnessControllerTest { 
        for (int i = 0; i < 1000; i++) {

            lux += increment;

            mClock.fastForward(increment);

            listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, lux,

            listener.onSensorChanged(createSensorEvent(mLightSensor, lux,

                    (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        }

        mClock.fastForward(AMBIENT_LIGHT_HORIZON_LONG + 10);

        int newLux = 2000;

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, newLux,

        listener.onSensorChanged(createSensorEvent(mLightSensor, newLux,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));



        float[] sensorValues = mController.getLastSensorValues();
@@ -884,7 +886,7 @@ public class AutomaticBrightnessControllerTest { 
        for (int i = 0; i < 20; i++) {

            lux += increment1;

            mClock.fastForward(increment1);

            listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, lux,

            listener.onSensorChanged(createSensorEvent(mLightSensor, lux,

                    (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        }
@@ -895,7 +897,7 @@ public class AutomaticBrightnessControllerTest { 
        for (int i = 0; i < initialCapacity - valuesCount; i++) {

            lux += increment2;

            mClock.fastForward(increment2);

            listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, lux,

            listener.onSensorChanged(createSensorEvent(mLightSensor, lux,

                    (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        }
@@ -969,28 +971,28 @@ public class AutomaticBrightnessControllerTest { 


        // t = 0

        // Initial lux

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 500,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 500,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(500, mController.getAmbientLux(), EPSILON);



        // t = 1000

        // Lux isn't steady yet

        mClock.fastForward(1000);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 1200,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 1200,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(500, mController.getAmbientLux(), EPSILON);



        // t = 1500

        // Lux isn't steady yet

        mClock.fastForward(500);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 1200,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 1200,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(500, mController.getAmbientLux(), EPSILON);



        // t = 2500

        // Lux is steady now

        mClock.fastForward(1000);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 1200,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 1200,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(1200, mController.getAmbientLux(), EPSILON);

    }
@@ -1014,28 +1016,28 @@ public class AutomaticBrightnessControllerTest { 


        // t = 0

        // Initial lux

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 1200,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 1200,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(1200, mController.getAmbientLux(), EPSILON);



        // t = 2000

        // Lux isn't steady yet

        mClock.fastForward(2000);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 500,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 500,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(1200, mController.getAmbientLux(), EPSILON);



        // t = 2500

        // Lux isn't steady yet

        mClock.fastForward(500);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 500,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 500,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(1200, mController.getAmbientLux(), EPSILON);



        // t = 4500

        // Lux is steady now

        mClock.fastForward(2000);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 500,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 500,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(500, mController.getAmbientLux(), EPSILON);

    }
@@ -1057,21 +1059,21 @@ public class AutomaticBrightnessControllerTest { 


        // t = 0

        // Initial lux

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 500,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 500,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(500, mController.getAmbientLux(), EPSILON);



        // t = 500

        // Lux isn't steady yet

        mClock.fastForward(500);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 1200,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 1200,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(500, mController.getAmbientLux(), EPSILON);



        // t = 1500

        // Lux is steady now

        mClock.fastForward(1000);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 1200,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 1200,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(1200, mController.getAmbientLux(), EPSILON);

    }
@@ -1097,21 +1099,21 @@ public class AutomaticBrightnessControllerTest { 


        // t = 0

        // Initial lux

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 1200,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 1200,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(1200, mController.getAmbientLux(), EPSILON);



        // t = 1000

        // Lux isn't steady yet

        mClock.fastForward(1000);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 500,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 500,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(1200, mController.getAmbientLux(), EPSILON);



        // t = 2500

        // Lux is steady now

        mClock.fastForward(1500);

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, 500,

        listener.onSensorChanged(createSensorEvent(mLightSensor, 500,

                (mClock.now() + ANDROID_SLEEP_TIME) * NANO_SECONDS_MULTIPLIER));

        assertEquals(500, mController.getAmbientLux(), EPSILON);

    }
@@ -1141,7 +1143,7 @@ public class AutomaticBrightnessControllerTest { 
                /* useNormalBrightnessForDoze= */ false, /* shouldResetShortTermModel= */ true);



        // Send a new sensor value

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, (int) lux));

        listener.onSensorChanged(createSensorEvent(mLightSensor, (int) lux));



        // The brightness should be scaled by the doze factor

        assertEquals(normalizedBrightness * DOZE_SCALE_FACTOR,
@@ -1178,7 +1180,7 @@ public class AutomaticBrightnessControllerTest { 
                /* useNormalBrightnessForDoze= */ false, /* shouldResetShortTermModel= */ true);



        // Send a new sensor value

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, (int) lux));

        listener.onSensorChanged(createSensorEvent(mLightSensor, (int) lux));



        // The brightness should be scaled by the doze factor

        assertEquals(normalizedBrightness * DOZE_SCALE_FACTOR,
@@ -1215,7 +1217,7 @@ public class AutomaticBrightnessControllerTest { 
                /* useNormalBrightnessForDoze= */ true, /* shouldResetShortTermModel= */ true);



        // Send a new sensor value

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, (int) lux));

        listener.onSensorChanged(createSensorEvent(mLightSensor, (int) lux));



        // The brightness should not be scaled by the doze factor

        assertEquals(normalizedBrightness,
@@ -1250,7 +1252,7 @@ public class AutomaticBrightnessControllerTest { 
                /* useNormalBrightnessForDoze= */ true, /* shouldResetShortTermModel= */ true);



        // Send a new sensor value

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, (int) lux));

        listener.onSensorChanged(createSensorEvent(mLightSensor, (int) lux));



        // The brightness should be scaled by the doze factor

        assertEquals(normalizedBrightness * DOZE_SCALE_FACTOR,
@@ -1285,7 +1287,7 @@ public class AutomaticBrightnessControllerTest { 
                /* useNormalBrightnessForDoze= */ true, /* shouldResetShortTermModel= */ true);



        // Send a new sensor value

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, (int) lux));

        listener.onSensorChanged(createSensorEvent(mLightSensor, (int) lux));



        // The brightness should not be scaled by the doze factor

        assertEquals(normalizedBrightness,
@@ -1311,7 +1313,7 @@ public class AutomaticBrightnessControllerTest { 
        when(mBrightnessClamperController.getMaxBrightness()).thenReturn(BRIGHTNESS_MAX_FLOAT);



        // Send a new sensor value

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, (int) lux));

        listener.onSensorChanged(createSensorEvent(mLightSensor, (int) lux));



        // Switch mode to DOZE

        mController.switchMode(AUTO_BRIGHTNESS_MODE_DOZE, /* sendUpdate= */ false);
@@ -1339,7 +1341,7 @@ public class AutomaticBrightnessControllerTest { 
        when(mBrightnessClamperController.getMaxBrightness()).thenReturn(BRIGHTNESS_MAX_FLOAT);



        // Send a new sensor value

        listener.onSensorChanged(TestUtils.createSensorEvent(mLightSensor, (int) lux));

        listener.onSensorChanged(createSensorEvent(mLightSensor, (int) lux));



        // Switch mode to DOZE

        mController.switchMode(AUTO_BRIGHTNESS_MODE_DOZE, /* sendUpdate= */ true);

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

+10 −6

File changed.

Preview size limit exceeded, changes collapsed.

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

+10 −7

File changed.

Preview size limit exceeded, changes collapsed.

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

+11 −8

File changed.

Preview size limit exceeded, changes collapsed.

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

+6 −5
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import static com.android.server.display.LogicalDisplayMapper.LOGICAL_DISPLAY_EV 
import static com.android.server.display.LogicalDisplayMapper.LOGICAL_DISPLAY_EVENT_REFRESH_RATE_CHANGED;

import static com.android.server.display.LogicalDisplayMapper.LOGICAL_DISPLAY_EVENT_REMOVED;

import static com.android.server.display.LogicalDisplayMapper.LOGICAL_DISPLAY_EVENT_STATE_CHANGED;

import static com.android.server.display.TestUtilsKt.createTestDisplayAddress;

import static com.android.server.display.layout.Layout.Display.POSITION_REAR;

import static com.android.server.display.layout.Layout.Display.POSITION_UNKNOWN;

import static com.android.server.utils.FoldSettingProvider.SETTING_VALUE_SELECTIVE_STAY_AWAKE;
@@ -993,9 +994,9 @@ public class LogicalDisplayMapperTest { 
    @Test

    public void testEnabledAndDisabledDisplays() {

        initLogicalDisplayMapper();

        DisplayAddress displayAddressOne = new TestUtils.TestDisplayAddress();

        DisplayAddress displayAddressTwo = new TestUtils.TestDisplayAddress();

        DisplayAddress displayAddressThree = new TestUtils.TestDisplayAddress();

        DisplayAddress displayAddressOne = createTestDisplayAddress();

        DisplayAddress displayAddressTwo = createTestDisplayAddress();

        DisplayAddress displayAddressThree = createTestDisplayAddress();



        TestDisplayDevice device1 = createDisplayDevice(displayAddressOne, "one",

                TYPE_INTERNAL, 600, 800, DisplayDeviceInfo.FLAG_ALLOWED_TO_BE_DEFAULT_DISPLAY);
@@ -1341,13 +1342,13 @@ public class LogicalDisplayMapperTest { 


    private TestDisplayDevice createDisplayDevice(int type, int width, int height, int flags) {

        return createDisplayDevice(

                new TestUtils.TestDisplayAddress(), /*  uniqueId */ "", type, width, height, flags);

                createTestDisplayAddress(), /*  uniqueId */ "", type, width, height, flags);

    }



    private TestDisplayDevice createDisplayDevice(

            int type, String uniqueId, int width, int height, int flags) {

        return createDisplayDevice(

                new TestUtils.TestDisplayAddress(), uniqueId, type, width, height, flags);

                createTestDisplayAddress(), uniqueId, type, width, height, flags);

    }



    private TestDisplayDevice createDisplayDevice(