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

Commit 2cac569b authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Fixes SystemUI crash when creating splash screen..." into main

parents cd319544 d6647b9d

libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java

+2 −1
Original line number Diff line number Diff line
@@ -681,7 +681,8 @@ public class SplashscreenContentDrawer { 
            // C. The background of the adaptive icon is grayscale, and the foreground of the

            // adaptive icon forms a certain contrast with the theme color.

            // D. Didn't specify icon background color.

            if (!iconColor.mIsBgComplex && mTmpAttrs.mIconBgColor == Color.TRANSPARENT

            if (iconForeground != null

                    && !iconColor.mIsBgComplex && mTmpAttrs.mIconBgColor == Color.TRANSPARENT

                    && (isRgbSimilarInHsv(mThemeColor, iconColor.mBgColor)

                            || (iconColor.mIsBgGrayscale

                                    && !isRgbSimilarInHsv(mThemeColor, iconColor.mFgColor)))) {