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

Commit f1ecd469 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Fix potential crash when exit splash screen" am: 18b88655 

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



Change-Id: Ifb77c3bc08c7c56f518a93fa05168a68f4db7080
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41859270 18b88655

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

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



        @Override

        public @Nullable SplashScreenView get() {

        @Nullable

        public SplashScreenView get() {

            synchronized (this) {

                while (!mIsViewSet) {

                    try {
@@ -691,7 +692,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;
@@ -732,7 +733,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) {