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

Commit 30f6f76a authored by Peiyong Lin's avatar Peiyong Lin Committed by android-build-merger
Browse files

Merge "Make sure the color space range is checked properly." into qt-dev am: 53e38f26 

am: 3560692f

Change-Id: Iff107f04cac77a8951b18943ca01cc49eca5e8cc
parents d3ac0dfa 3560692f

core/java/android/app/ActivityManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1863,7 +1863,7 @@ public class ActivityManager { 
            mTopActivityComponent = ComponentName.readFromParcel(source);

            mTopActivityComponent = ComponentName.readFromParcel(source);

            mSnapshot = source.readParcelable(null /* classLoader */);

            mSnapshot = source.readParcelable(null /* classLoader */);

            int colorSpaceId = source.readInt();

            int colorSpaceId = source.readInt();

            mColorSpace = colorSpaceId >= 0

            mColorSpace = colorSpaceId >= 0 && colorSpaceId < ColorSpace.Named.values().length

                    ? ColorSpace.get(ColorSpace.Named.values()[colorSpaceId])

                    ? ColorSpace.get(ColorSpace.Named.values()[colorSpaceId])

                    : ColorSpace.get(ColorSpace.Named.SRGB);

                    : ColorSpace.get(ColorSpace.Named.SRGB);

            mOrientation = source.readInt();

            mOrientation = source.readInt();