diff options
7 files changed, 113 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/display/ColorFade.java b/services/core/java/com/android/server/display/ColorFade.java index 0d6635d5b6e4..2d763bc486bb 100644 --- a/services/core/java/com/android/server/display/ColorFade.java +++ b/services/core/java/com/android/server/display/ColorFade.java @@ -407,6 +407,12 @@ 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. diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index e6b50572e6a3..40dbabf29807 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -3536,7 +3536,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call DisplayPowerState getDisplayPowerState(DisplayBlanker blanker, ColorFade colorFade, int displayId, int displayState) { - return new DisplayPowerState(blanker, colorFade, displayId, displayState); + return new DisplayPowerState(blanker, colorFade, displayId, displayState, + new Handler(/*async=*/ true)); } DualRampAnimator<DisplayPowerState> getDualRampAnimator(DisplayPowerState dps, diff --git a/services/core/java/com/android/server/display/DisplayPowerController2.java b/services/core/java/com/android/server/display/DisplayPowerController2.java index 252c29d41a5a..051c88690713 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController2.java +++ b/services/core/java/com/android/server/display/DisplayPowerController2.java @@ -319,8 +319,6 @@ 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; @@ -2871,7 +2869,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal DisplayPowerState getDisplayPowerState(DisplayBlanker blanker, ColorFade colorFade, int displayId, int displayState) { - return new DisplayPowerState(blanker, colorFade, displayId, displayState); + return new DisplayPowerState(blanker, colorFade, displayId, displayState, + new Handler(/*async=*/ true)); } DualRampAnimator<DisplayPowerState> getDualRampAnimator(DisplayPowerState dps, diff --git a/services/core/java/com/android/server/display/DisplayPowerState.java b/services/core/java/com/android/server/display/DisplayPowerState.java index 2c257a17af91..85c6a6de860f 100644 --- a/services/core/java/com/android/server/display/DisplayPowerState.java +++ b/services/core/java/com/android/server/display/DisplayPowerState.java @@ -74,8 +74,9 @@ final class DisplayPowerState { private volatile boolean mStopped; DisplayPowerState( - DisplayBlanker blanker, ColorFade colorFade, int displayId, int displayState) { - mHandler = new Handler(true /*async*/); + DisplayBlanker blanker, ColorFade colorFade, int displayId, int displayState, + Handler handler) { + mHandler = handler; mChoreographer = Choreographer.getInstance(); mBlanker = blanker; mColorFade = colorFade; @@ -317,6 +318,7 @@ final class DisplayPowerState { mStopped = true; mPhotonicModulator.interrupt(); dismissColorFade(); + stopColorFade(); mCleanListener = null; mHandler.removeCallbacksAndMessages(null); } @@ -376,6 +378,11 @@ 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() { diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java index 0195ff7b7a0c..e7dc48e529eb 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java @@ -1160,6 +1160,21 @@ public final class DisplayPowerController2Test { eq(BRIGHTNESS_RAMP_RATE_SLOW_INCREASE_IDLE)); } + @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}. */ diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java index f499ac5fb6c3..2640390ceecf 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java @@ -1167,6 +1167,21 @@ public final class DisplayPowerControllerTest { eq(BRIGHTNESS_RAMP_RATE_SLOW_INCREASE_IDLE)); } + @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(); + } + private void advanceTime(long timeMs) { mClock.fastForward(timeMs); mTestLooper.dispatchAll(); diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerStateTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerStateTest.java new file mode 100644 index 000000000000..167a412d3860 --- /dev/null +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerStateTest.java @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2023 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; + +import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; + +import static org.mockito.Mockito.times; + +import android.os.Handler; +import android.os.test.TestLooper; +import android.view.Display; + +import androidx.test.filters.SmallTest; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + + +@SmallTest +public class DisplayPowerStateTest { + private static final int DISPLAY_ID = 123; + + private DisplayPowerState mDisplayPowerState; + private TestLooper mTestLooper; + @Mock + private DisplayBlanker mDisplayBlankerMock; + @Mock + private ColorFade mColorFadeMock; + + @Rule + public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + + @Before + public void setUp() { + mTestLooper = new TestLooper(); + mDisplayPowerState = new DisplayPowerState( + mDisplayBlankerMock, mColorFadeMock, DISPLAY_ID, Display.STATE_ON, + new Handler(mTestLooper.getLooper())); + } + + @Test + public void testColorFadeStopsOnDpsStop() { + mDisplayPowerState.stop(); + verify(mColorFadeMock, times(1)).stop(); + } +} |