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

Commit 2ec8bed6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix colorSpace lose during screen rotation." into tm-dev am: 0be3f090 am: 4defc7f6 

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



Change-Id: I80ffb989ef411664623da5d83ba7d6c279334d48
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8316e360 4defc7f6

core/java/android/view/SurfaceControl.java

+2 −2
Original line number Diff line number Diff line
@@ -3883,8 +3883,8 @@ public final class SurfaceControl implements Parcelable { 
        @Deprecated

        public Transaction setColorSpace(SurfaceControl sc, ColorSpace colorSpace) {

            checkPreconditions(sc);

            if (colorSpace.getId() == ColorSpace.Named.DCI_P3.ordinal()) {

                setDataSpace(sc, DataSpace.DATASPACE_DCI_P3);

            if (colorSpace.getId() == ColorSpace.Named.DISPLAY_P3.ordinal()) {

                setDataSpace(sc, DataSpace.DATASPACE_DISPLAY_P3);

            } else {

                setDataSpace(sc, DataSpace.DATASPACE_SRGB);

            }