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

Commit 317827fe authored by Rupesh Bansal's avatar Rupesh Bansal Committed by Android (Google) Code Review
Browse files

Merge "Added StrategySelectionRequest" into main

parents 345ef805 38b06a49

services/core/java/com/android/server/display/brightness/DisplayBrightnessController.java

+7 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ public final class DisplayBrightnessController { 
        DisplayBrightnessState state;

        synchronized (mLock) {

            mDisplayBrightnessStrategy = mDisplayBrightnessStrategySelector.selectStrategy(

                    displayPowerRequest, targetDisplayState);

                    constructStrategySelectionRequest(displayPowerRequest, targetDisplayState));

            state = mDisplayBrightnessStrategy.updateBrightness(displayPowerRequest);

        }
@@ -522,4 +522,10 @@ public final class DisplayBrightnessController { 
            mCurrentScreenBrightness = currentBrightnessSetting;

        }

    }



    private StrategySelectionRequest constructStrategySelectionRequest(

            DisplayManagerInternal.DisplayPowerRequest displayPowerRequest,

            int targetDisplayState) {

        return new StrategySelectionRequest(displayPowerRequest, targetDisplayState);

    }

}

services/core/java/com/android/server/display/brightness/DisplayBrightnessStrategySelector.java

+4 −2
Original line number Diff line number Diff line
@@ -122,9 +122,11 @@ public class DisplayBrightnessStrategySelector { 
     */

    @NonNull

    public DisplayBrightnessStrategy selectStrategy(

            DisplayManagerInternal.DisplayPowerRequest displayPowerRequest,

            int targetDisplayState) {

            StrategySelectionRequest strategySelectionRequest) {

        DisplayBrightnessStrategy displayBrightnessStrategy = mInvalidBrightnessStrategy;

        int targetDisplayState = strategySelectionRequest.getTargetDisplayState();

        DisplayManagerInternal.DisplayPowerRequest displayPowerRequest = strategySelectionRequest

                .getDisplayPowerRequest();

        if (targetDisplayState == Display.STATE_OFF) {

            displayBrightnessStrategy = mScreenOffBrightnessStrategy;

        } else if (shouldUseDozeBrightnessStrategy(displayPowerRequest)) {

services/core/java/com/android/server/display/brightness/StrategySelectionRequest.java

0 → 100644
+62 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.display.brightness;



import android.hardware.display.DisplayManagerInternal;



import java.util.Objects;



/**

 * A wrapper class to encapsulate the request to select a strategy from

 * DisplayBrightnessStrategySelector

 */

public final class StrategySelectionRequest {

    // The request to change the associated display's state and brightness

    private DisplayManagerInternal.DisplayPowerRequest mDisplayPowerRequest;



    // The display state to which the screen is switching to

    private int mTargetDisplayState;



    public StrategySelectionRequest(DisplayManagerInternal.DisplayPowerRequest displayPowerRequest,

            int targetDisplayState) {

        mDisplayPowerRequest = displayPowerRequest;

        mTargetDisplayState = targetDisplayState;

    }



    public DisplayManagerInternal.DisplayPowerRequest getDisplayPowerRequest() {

        return mDisplayPowerRequest;

    }



    public int getTargetDisplayState() {

        return mTargetDisplayState;

    }



    @Override

    public boolean equals(Object obj) {

        if (!(obj instanceof StrategySelectionRequest)) {

            return false;

        }

        StrategySelectionRequest other = (StrategySelectionRequest) obj;

        return Objects.equals(other.getDisplayPowerRequest(), getDisplayPowerRequest())

                && other.getTargetDisplayState() == getTargetDisplayState();

    }



    @Override

    public int hashCode() {

        return Objects.hash(mDisplayPowerRequest, mTargetDisplayState);

    }

}

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

+4 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.display.brightness; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;
@@ -109,8 +110,9 @@ public final class DisplayBrightnessControllerTest { 
        DisplayPowerRequest displayPowerRequest = mock(DisplayPowerRequest.class);

        DisplayBrightnessStrategy displayBrightnessStrategy = mock(DisplayBrightnessStrategy.class);

        int targetDisplayState = Display.STATE_DOZE;

        when(mDisplayBrightnessStrategySelector.selectStrategy(displayPowerRequest,

                targetDisplayState)).thenReturn(displayBrightnessStrategy);

        when(mDisplayBrightnessStrategySelector.selectStrategy(

                eq(new StrategySelectionRequest(displayPowerRequest, targetDisplayState))))

                .thenReturn(displayBrightnessStrategy);

        mDisplayBrightnessController.updateBrightness(displayPowerRequest, targetDisplayState);

        verify(displayBrightnessStrategy).updateBrightness(displayPowerRequest);

        assertEquals(mDisplayBrightnessController.getCurrentDisplayBrightnessStrategy(),

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

+31 −21
Original line number Diff line number Diff line
@@ -161,8 +161,9 @@ public final class DisplayBrightnessStrategySelectorTest { 
        displayPowerRequest.dozeScreenBrightness = 0.2f;

        when(mResources.getBoolean(R.bool.config_allowAutoBrightnessWhileDozing)).thenReturn(

                DISALLOW_AUTO_BRIGHTNESS_WHILE_DOZING);

        assertEquals(mDisplayBrightnessStrategySelector.selectStrategy(displayPowerRequest,

                Display.STATE_DOZE), mDozeBrightnessModeStrategy);

        assertEquals(mDisplayBrightnessStrategySelector.selectStrategy(

                        new StrategySelectionRequest(displayPowerRequest, Display.STATE_DOZE)),

                mDozeBrightnessModeStrategy);

    }



    @Test
@@ -173,16 +174,18 @@ public final class DisplayBrightnessStrategySelectorTest { 
        displayPowerRequest.dozeScreenBrightness = PowerManager.BRIGHTNESS_INVALID_FLOAT;

        when(mResources.getBoolean(R.bool.config_allowAutoBrightnessWhileDozing)).thenReturn(

                DISALLOW_AUTO_BRIGHTNESS_WHILE_DOZING);

        assertNotEquals(mDisplayBrightnessStrategySelector.selectStrategy(displayPowerRequest,

                Display.STATE_DOZE), mDozeBrightnessModeStrategy);

        assertNotEquals(mDisplayBrightnessStrategySelector.selectStrategy(

                new StrategySelectionRequest(displayPowerRequest, Display.STATE_DOZE)),

                mDozeBrightnessModeStrategy);

    }



    @Test

    public void selectStrategySelectsScreenOffStrategyWhenValid() {

        DisplayManagerInternal.DisplayPowerRequest displayPowerRequest = mock(

                DisplayManagerInternal.DisplayPowerRequest.class);

        assertEquals(mDisplayBrightnessStrategySelector.selectStrategy(displayPowerRequest,

                Display.STATE_OFF), mScreenOffBrightnessModeStrategy);

        assertEquals(mDisplayBrightnessStrategySelector.selectStrategy(

                        new StrategySelectionRequest(displayPowerRequest, Display.STATE_OFF)),

                mScreenOffBrightnessModeStrategy);

    }



    @Test
@@ -191,8 +194,9 @@ public final class DisplayBrightnessStrategySelectorTest { 
                DisplayManagerInternal.DisplayPowerRequest.class);

        displayPowerRequest.screenBrightnessOverride = 0.4f;

        when(mFollowerBrightnessStrategy.getBrightnessToFollow()).thenReturn(Float.NaN);

        assertEquals(mDisplayBrightnessStrategySelector.selectStrategy(displayPowerRequest,

                Display.STATE_ON), mOverrideBrightnessStrategy);

        assertEquals(mDisplayBrightnessStrategySelector.selectStrategy(

                        new StrategySelectionRequest(displayPowerRequest, Display.STATE_ON)),

                mOverrideBrightnessStrategy);

    }



    @Test
@@ -202,8 +206,9 @@ public final class DisplayBrightnessStrategySelectorTest { 
        displayPowerRequest.screenBrightnessOverride = Float.NaN;

        when(mFollowerBrightnessStrategy.getBrightnessToFollow()).thenReturn(Float.NaN);

        when(mTemporaryBrightnessStrategy.getTemporaryScreenBrightness()).thenReturn(0.3f);

        assertEquals(mDisplayBrightnessStrategySelector.selectStrategy(displayPowerRequest,

                Display.STATE_ON), mTemporaryBrightnessStrategy);

        assertEquals(mDisplayBrightnessStrategySelector.selectStrategy(

                        new StrategySelectionRequest(displayPowerRequest, Display.STATE_ON)),

                mTemporaryBrightnessStrategy);

    }



    @Test
@@ -214,8 +219,9 @@ public final class DisplayBrightnessStrategySelectorTest { 
        when(mFollowerBrightnessStrategy.getBrightnessToFollow()).thenReturn(Float.NaN);

        displayPowerRequest.screenBrightnessOverride = Float.NaN;

        when(mTemporaryBrightnessStrategy.getTemporaryScreenBrightness()).thenReturn(Float.NaN);

        assertEquals(mDisplayBrightnessStrategySelector.selectStrategy(displayPowerRequest,

                Display.STATE_ON), mBoostBrightnessStrategy);

        assertEquals(mDisplayBrightnessStrategySelector.selectStrategy(

                        new StrategySelectionRequest(displayPowerRequest, Display.STATE_ON)),

                mBoostBrightnessStrategy);

    }



    @Test
@@ -226,8 +232,9 @@ public final class DisplayBrightnessStrategySelectorTest { 
        when(mFollowerBrightnessStrategy.getBrightnessToFollow()).thenReturn(Float.NaN);

        when(mTemporaryBrightnessStrategy.getTemporaryScreenBrightness()).thenReturn(Float.NaN);

        when(mOffloadBrightnessStrategy.getOffloadScreenBrightness()).thenReturn(Float.NaN);

        assertEquals(mDisplayBrightnessStrategySelector.selectStrategy(displayPowerRequest,

                Display.STATE_ON), mInvalidBrightnessStrategy);

        assertEquals(mDisplayBrightnessStrategySelector.selectStrategy(

                        new StrategySelectionRequest(displayPowerRequest, Display.STATE_ON)),

                mInvalidBrightnessStrategy);

    }



    @Test
@@ -235,8 +242,9 @@ public final class DisplayBrightnessStrategySelectorTest { 
        DisplayManagerInternal.DisplayPowerRequest displayPowerRequest = mock(

                DisplayManagerInternal.DisplayPowerRequest.class);

        when(mFollowerBrightnessStrategy.getBrightnessToFollow()).thenReturn(0.3f);

        assertEquals(mDisplayBrightnessStrategySelector.selectStrategy(displayPowerRequest,

                Display.STATE_ON), mFollowerBrightnessStrategy);

        assertEquals(mDisplayBrightnessStrategySelector.selectStrategy(

                        new StrategySelectionRequest(displayPowerRequest, Display.STATE_ON)),

                mFollowerBrightnessStrategy);

    }



    @Test
@@ -251,8 +259,9 @@ public final class DisplayBrightnessStrategySelectorTest { 
        when(mTemporaryBrightnessStrategy.getTemporaryScreenBrightness()).thenReturn(Float.NaN);

        when(mAutomaticBrightnessStrategy.shouldUseAutoBrightness()).thenReturn(true);

        when(mOffloadBrightnessStrategy.getOffloadScreenBrightness()).thenReturn(0.3f);

        assertEquals(mOffloadBrightnessStrategy, mDisplayBrightnessStrategySelector.selectStrategy(

                displayPowerRequest, Display.STATE_ON));

        assertEquals(mDisplayBrightnessStrategySelector.selectStrategy(

                        new StrategySelectionRequest(displayPowerRequest, Display.STATE_ON)),

                mOffloadBrightnessStrategy);

    }



    @Test
@@ -267,8 +276,8 @@ public final class DisplayBrightnessStrategySelectorTest { 
        when(mTemporaryBrightnessStrategy.getTemporaryScreenBrightness()).thenReturn(Float.NaN);

        when(mOffloadBrightnessStrategy.getOffloadScreenBrightness()).thenReturn(0.3f);

        assertNotEquals(mOffloadBrightnessStrategy,

                mDisplayBrightnessStrategySelector.selectStrategy(displayPowerRequest,

                        Display.STATE_ON));

                mDisplayBrightnessStrategySelector.selectStrategy(

                        new StrategySelectionRequest(displayPowerRequest, Display.STATE_ON)));

    }



    @Test
@@ -280,7 +289,8 @@ public final class DisplayBrightnessStrategySelectorTest { 
                DisplayManagerInternal.DisplayPowerRequest.class);

        when(mFollowerBrightnessStrategy.getBrightnessToFollow()).thenReturn(0.3f);



        mDisplayBrightnessStrategySelector.selectStrategy(displayPowerRequest, Display.STATE_ON);

        mDisplayBrightnessStrategySelector.selectStrategy(

                new StrategySelectionRequest(displayPowerRequest, Display.STATE_ON));



        StrategySelectionNotifyRequest strategySelectionNotifyRequest =

                new StrategySelectionNotifyRequest(mFollowerBrightnessStrategy);