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

Commit 17a3f6a3 authored by Fiona Campbell's avatar Fiona Campbell Committed by Automerger Merge Worker
Browse files

Merge "Revert "Destroy EGL context on colorfade.stop"" into udc-qpr-dev am: 968471b3 

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



Change-Id: I52e5d5eb4e4bbb98797d726510b06184d443dd60
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7d94b8b7 968471b3

services/core/java/com/android/server/display/ColorFade.java

+0 −6
Original line number Diff line number Diff line
@@ -401,12 +401,6 @@ final class ColorFade { 
        }

    }



    void stop() {

        if (mEglContext != null && mEglDisplay != null) {

            EGL14.eglDestroyContext(mEglDisplay, mEglContext);

        }

    }



    /**

     * Draws an animation frame showing the color fade activated at the

     * specified level.

services/core/java/com/android/server/display/DisplayPowerController.java

+1 −2
Original line number Diff line number Diff line
@@ -3519,8 +3519,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 


        DisplayPowerState getDisplayPowerState(DisplayBlanker blanker, ColorFade colorFade,

                int displayId, int displayState) {

            return new DisplayPowerState(blanker, colorFade, displayId, displayState,

                    new Handler(/*async=*/ true));

            return new DisplayPowerState(blanker, colorFade, displayId, displayState);

        }



        DualRampAnimator<DisplayPowerState> getDualRampAnimator(DisplayPowerState dps,

services/core/java/com/android/server/display/DisplayPowerController2.java

+3 −2
Original line number Diff line number Diff line
@@ -324,6 +324,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
    // Must only be accessed on the handler thread.

    private DisplayPowerState mPowerState;







    // The currently active screen on unblocker.  This field is non-null whenever

    // we are waiting for a callback to release it and unblock the screen.

    private ScreenOnUnblocker mPendingScreenOnUnblocker;
@@ -2882,8 +2884,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 


        DisplayPowerState getDisplayPowerState(DisplayBlanker blanker, ColorFade colorFade,

                int displayId, int displayState) {

            return new DisplayPowerState(blanker, colorFade, displayId, displayState,

                    new Handler(/*async=*/ true));

            return new DisplayPowerState(blanker, colorFade, displayId, displayState);

        }



        DualRampAnimator<DisplayPowerState> getDualRampAnimator(DisplayPowerState dps,

services/core/java/com/android/server/display/DisplayPowerState.java

+2 −9
Original line number Diff line number Diff line
@@ -74,9 +74,8 @@ final class DisplayPowerState { 
    private volatile boolean mStopped;



    DisplayPowerState(

            DisplayBlanker blanker, ColorFade colorFade, int displayId, int displayState,

            Handler handler) {

        mHandler = handler;

            DisplayBlanker blanker, ColorFade colorFade, int displayId, int displayState) {

        mHandler = new Handler(true /*async*/);

        mChoreographer = Choreographer.getInstance();

        mBlanker = blanker;

        mColorFade = colorFade;
@@ -318,7 +317,6 @@ final class DisplayPowerState { 
        mStopped = true;

        mPhotonicModulator.interrupt();

        dismissColorFade();

        stopColorFade();

        mCleanListener = null;

        mHandler.removeCallbacksAndMessages(null);

    }
@@ -378,11 +376,6 @@ final class DisplayPowerState { 
        }

    }



    // Clears up color fade resources.

    private void stopColorFade() {

        if (mColorFade != null) mColorFade.stop();

    }



    private final Runnable mScreenUpdateRunnable = new Runnable() {

        @Override

        public void run() {

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

+0 −15
Original line number Diff line number Diff line
@@ -1104,21 +1104,6 @@ public final class DisplayPowerController2Test { 
        verify(mDisplayWhiteBalanceControllerMock, times(1)).setStrongModeEnabled(true);

    }



    @Test

    public void testPowerStateStopsOnDpcStop() {

        // Set up

        DisplayPowerRequest dpr = new DisplayPowerRequest();

        mHolder.dpc.requestPowerState(dpr, /* waitForNegativeProximity= */ false);

        advanceTime(1);



        // Stop dpc

        mHolder.dpc.stop();

        advanceTime(1);



        // Ensure dps has stopped

        verify(mHolder.displayPowerState, times(1)).stop();

    }



    /**

     * Creates a mock and registers it to {@link LocalServices}.

     */