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

Commit 58db7ce1 authored by Jane Ha's avatar Jane Ha Committed by Android (Google) Code Review
Browse files

Merge "Fix potential crash when exit splash screen" into tm-qpr-dev

parents c8df321b 18646d58
Loading
Loading
Loading
Loading
+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) {