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

Commit d6647b9d authored by wilsonshih's avatar wilsonshih
Browse files

Fixes SystemUI crash when creating splash screen... 

...because of invalidate adaptive icon format.
The foreground of adaptive icon can be null.

Flag: EXEMPT bugfix
Bug: 391243082
Test: launch sample app and verify no crash.
Test: atest SplashscreenTests
Change-Id: I9fa9b8fce13e0343a583717f6d90949ea086af6b
parent 0e0e1d3e

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