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

Commit 18b88655 authored by Riddle Hsu's avatar Riddle Hsu Committed by Gerrit Code Review
Browse files

Merge "Fix potential crash when exit splash screen"

parents 3760f9b7 1a797c71

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

+4 −3
Original line number Diff line number Diff line
@@ -429,7 +429,8 @@ public class StartingSurfaceDrawer { 
        }



        @Override

        public @Nullable SplashScreenView get() {

        @Nullable

        public SplashScreenView get() {

            synchronized (this) {

                while (!mIsViewSet) {

                    try {
@@ -690,7 +691,7 @@ public class StartingSurfaceDrawer { 
        private final TaskSnapshotWindow mTaskSnapshotWindow;

        private SplashScreenView mContentView;

        private boolean mSetSplashScreen;

        private @StartingWindowType int mSuggestType;

        @StartingWindowType private int mSuggestType;

        private int mBGColor;

        private final long mCreateTime;

        private int mSystemBarAppearance;
@@ -731,7 +732,7 @@ public class StartingSurfaceDrawer { 


        // Reset the system bar color which set by splash screen, make it align to the app.

        private void clearSystemBarColor() {

            if (mDecorView == null) {

            if (mDecorView == null || !mDecorView.isAttachedToWindow()) {

                return;

            }

            if (mDecorView.getLayoutParams() instanceof WindowManager.LayoutParams) {