diff options
7 files changed, 6 insertions, 113 deletions
diff --git a/services/core/java/com/android/server/display/ColorFade.java b/services/core/java/com/android/server/display/ColorFade.java index 46d56ba5fea8..46cd496bdcd3 100644 --- a/services/core/java/com/android/server/display/ColorFade.java +++ b/services/core/java/com/android/server/display/ColorFade.java @@ -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. diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 94904caf5751..5c53caa8a884 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -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, diff --git a/services/core/java/com/android/server/display/DisplayPowerController2.java b/services/core/java/com/android/server/display/DisplayPowerController2.java index e849f7c97236..365c77032c4c 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController2.java +++ b/services/core/java/com/android/server/display/DisplayPowerController2.java @@ -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, diff --git a/services/core/java/com/android/server/display/DisplayPowerState.java b/services/core/java/com/android/server/display/DisplayPowerState.java index 85c6a6de860f..2c257a17af91 100644 --- a/services/core/java/com/android/server/display/DisplayPowerState.java +++ b/services/core/java/com/android/server/display/DisplayPowerState.java @@ -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() { 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 a0529d767642..ad8c5e56b9b4 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java @@ -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}. */ 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 5e79c7848a3b..8ddf7b66e816 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java @@ -1106,21 +1106,6 @@ public final class DisplayPowerControllerTest { 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}. */ diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerStateTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerStateTest.java deleted file mode 100644 index 167a412d3860..000000000000 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerStateTest.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * 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(); - } -} |