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

Commit 8efcbc77 authored by petsjonkin's avatar petsjonkin
Browse files

Dont allow light sensor subscription if screen is off 

onDisplayChange event can be called after screen is OFF, triggering light sensor subscription.
See also b/381757670#comment6

Bug: b/381757670
Test: atest BrightnessClamperControllerTest
Flag: EXEMPT bugfix
Change-Id: Iddf3e9beecfb3996b1b70480c594db15a44466be
parent 02d89d42

services/core/java/com/android/server/display/brightness/clamper/BrightnessClamperController.java

+6 −6
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ import android.provider.DeviceConfig; 
import android.provider.DeviceConfigInterface;

import android.provider.DeviceConfigInterface;

import android.util.IndentingPrintWriter;

import android.util.IndentingPrintWriter;

import android.util.Spline;

import android.util.Spline;

import android.view.Display;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.display.BrightnessSynchronizer;

import com.android.internal.display.BrightnessSynchronizer;
@@ -58,6 +59,7 @@ public class BrightnessClamperController { 
    private final DeviceConfigParameterProvider mDeviceConfigParameterProvider;

    private final DeviceConfigParameterProvider mDeviceConfigParameterProvider;

    private final Handler mHandler;

    private final Handler mHandler;

    private final LightSensorController mLightSensorController;

    private final LightSensorController mLightSensorController;

    private int mDisplayState = Display.STATE_OFF;





    private final ClamperChangeListener mClamperChangeListenerExternal;

    private final ClamperChangeListener mClamperChangeListenerExternal;

    private final Executor mExecutor;

    private final Executor mExecutor;
@@ -147,16 +149,13 @@ public class BrightnessClamperController { 
    public DisplayBrightnessState clamp(DisplayBrightnessState displayBrightnessState,

    public DisplayBrightnessState clamp(DisplayBrightnessState displayBrightnessState,

            DisplayManagerInternal.DisplayPowerRequest request,

            DisplayManagerInternal.DisplayPowerRequest request,

            float brightnessValue, boolean slowChange, int displayState) {

            float brightnessValue, boolean slowChange, int displayState) {

        mDisplayState = displayState;

        DisplayBrightnessState.Builder builder = DisplayBrightnessState.Builder.from(

        DisplayBrightnessState.Builder builder = DisplayBrightnessState.Builder.from(

                displayBrightnessState);

                displayBrightnessState);

        builder.setIsSlowChange(slowChange);

        builder.setIsSlowChange(slowChange);

        builder.setBrightness(brightnessValue);

        builder.setBrightness(brightnessValue);





        if (displayState != STATE_ON) {

            mLightSensorController.stop();

        } else {

        adjustLightSensorSubscription();

        adjustLightSensorSubscription();

        }





        for (int i = 0; i < mModifiers.size(); i++) {

        for (int i = 0; i < mModifiers.size(); i++) {

            mModifiers.get(i).apply(request, builder);

            mModifiers.get(i).apply(request, builder);
@@ -226,7 +225,8 @@ public class BrightnessClamperController { 
    }

    }





    private void adjustLightSensorSubscription() {

    private void adjustLightSensorSubscription() {

        if (mModifiers.stream().anyMatch(BrightnessStateModifier::shouldListenToLightSensor)) {

        if (mDisplayState == STATE_ON && mModifiers.stream()

                .anyMatch(BrightnessStateModifier::shouldListenToLightSensor)) {

            mLightSensorController.restart();

            mLightSensorController.restart();

        } else {

        } else {

            mLightSensorController.stop();

            mLightSensorController.stop();

services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/BrightnessClamperControllerTest.java

+25 −6
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ import static org.mockito.ArgumentMatchers.eq; 
import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.reset;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.when;
@@ -124,16 +125,11 @@ public class BrightnessClamperControllerTest { 




    @Test

    @Test

    public void testConstructor_doesNotStartsLightSensorController() {

    public void testConstructor_doesNotStartsLightSensorController() {

        verify(mMockLightSensorController, never()).restart();

    }



    @Test

    public void testConstructor_startsLightSensorController() {

        when(mMockModifier.shouldListenToLightSensor()).thenReturn(true);

        when(mMockModifier.shouldListenToLightSensor()).thenReturn(true);





        mClamperController = createBrightnessClamperController();

        mClamperController = createBrightnessClamperController();





        verify(mMockLightSensorController).restart();

        verify(mMockLightSensorController, never()).restart();

    }

    }





    @Test

    @Test
@@ -169,19 +165,42 @@ public class BrightnessClamperControllerTest { 




    @Test

    @Test

    public void testOnDisplayChanged_doesNotRestartLightSensor() {

    public void testOnDisplayChanged_doesNotRestartLightSensor() {

        mClamperController.clamp(mDisplayBrightnessState, mMockRequest, 0.1f,

                false, STATE_ON);

        reset(mMockLightSensorController);



        mClamperController.onDisplayChanged(mMockDisplayDeviceData);

        mClamperController.onDisplayChanged(mMockDisplayDeviceData);





        verify(mMockLightSensorController, never()).restart();

        verify(mMockLightSensorController, never()).restart();

        verify(mMockLightSensorController).stop();

    }

    }





    @Test

    @Test

    public void testOnDisplayChanged_restartsLightSensor() {

    public void testOnDisplayChanged_restartsLightSensor() {

        when(mMockModifier.shouldListenToLightSensor()).thenReturn(true);

        when(mMockModifier.shouldListenToLightSensor()).thenReturn(true);

        mClamperController.clamp(mDisplayBrightnessState, mMockRequest, 0.1f,

                false, STATE_ON);

        reset(mMockLightSensorController);



        mClamperController.onDisplayChanged(mMockDisplayDeviceData);

        mClamperController.onDisplayChanged(mMockDisplayDeviceData);





        verify(mMockLightSensorController, never()).stop();

        verify(mMockLightSensorController).restart();

        verify(mMockLightSensorController).restart();

    }

    }





    @Test

    public void testOnDisplayChanged_doesNotRestartLightSensor_screenOff() {

        when(mMockModifier.shouldListenToLightSensor()).thenReturn(true);

        mClamperController.clamp(mDisplayBrightnessState, mMockRequest, 0.1f,

                false, STATE_OFF);

        reset(mMockLightSensorController);



        mClamperController.onDisplayChanged(mMockDisplayDeviceData);



        verify(mMockLightSensorController, never()).restart();

        verify(mMockLightSensorController).stop();

    }



    @Test

    @Test

    public void testClamp_AppliesModifier() {

    public void testClamp_AppliesModifier() {

        float initialBrightness = 0.2f;

        float initialBrightness = 0.2f;