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

Commit b48f79c0 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... 

Merge "Fix colorSpace lose during screen rotation." into tm-dev am: 0be3f090 am: 71420321 am: cf4713e1 am: 31465c1b

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



Change-Id: I6c77634e5665ff5b27f8d70a12294d330bbe0509
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 731fb3e5 31465c1b

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);

            }