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

Commit d0ec3a75 authored by Chavi Weingarten's avatar Chavi Weingarten
Browse files

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
parent 5473b217

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

+1 −10
Original line number Diff line number Diff line
@@ -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;