From d0ec3a75f647e3311a780b08c12870b2b5dd920a Mon Sep 17 00:00:00 2001 From: Chavi Weingarten Date: Tue, 20 Sep 2022 19:49:31 +0000 Subject: [PATCH] Remove getInternalDisplayToken from ColorFade There's no need for ColorFade to use the internal display token since it already gets display info based on the displayId. It was only using the display token to get colorMode but it's already stored in DisplayInfo Test: ColorFadeTest Bug: 242714168 Change-Id: I2261189135b21f9c34ed7a0120e111d0f3788da9 --- .../java/com/android/server/display/ColorFade.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/services/core/java/com/android/server/display/ColorFade.java b/services/core/java/com/android/server/display/ColorFade.java index 2f67dddc1bf5e..372bc8ad94a17 100644 --- a/services/core/java/com/android/server/display/ColorFade.java +++ b/services/core/java/com/android/server/display/ColorFade.java @@ -31,7 +31,6 @@ import android.opengl.EGLDisplay; import android.opengl.EGLSurface; import android.opengl.GLES11Ext; import android.opengl.GLES20; -import android.os.IBinder; import android.util.Slog; import android.view.Display; import android.view.DisplayInfo; @@ -170,15 +169,7 @@ final class ColorFade { mDisplayWidth = displayInfo.getNaturalWidth(); mDisplayHeight = displayInfo.getNaturalHeight(); - final IBinder token = SurfaceControl.getInternalDisplayToken(); - if (token == null) { - Slog.e(TAG, - "Failed to take screenshot because internal display is disconnected"); - return false; - } - final boolean isWideColor = SurfaceControl.getDynamicDisplayInfo(token).activeColorMode - == Display.COLOR_MODE_DISPLAY_P3; - + final boolean isWideColor = displayInfo.colorMode == Display.COLOR_MODE_DISPLAY_P3; // Set mPrepared here so if initialization fails, resources can be cleaned up. mPrepared = true;