Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix potential crash when exit splash screen"

Browse Source
This commit is contained in:
Riddle Hsu
2022-11-10 07:26:08 +00:00
committed by Gerrit Code Review
parent 3760f9b7db 1a797c714b
commit 18b88655a4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -429,7 +429,8 @@ public class StartingSurfaceDrawer {
} }
@Override @Override
public @Nullable SplashScreenView get() { @Nullable
public SplashScreenView get() {
synchronized (this) { synchronized (this) {
while (!mIsViewSet) { while (!mIsViewSet) {
try { try {
@@ -690,7 +691,7 @@ public class StartingSurfaceDrawer {
private final TaskSnapshotWindow mTaskSnapshotWindow; private final TaskSnapshotWindow mTaskSnapshotWindow;
private SplashScreenView mContentView; private SplashScreenView mContentView;
private boolean mSetSplashScreen; private boolean mSetSplashScreen;
private @StartingWindowType int mSuggestType; @StartingWindowType private int mSuggestType;
private int mBGColor; private int mBGColor;
private final long mCreateTime; private final long mCreateTime;
private int mSystemBarAppearance; 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. // Reset the system bar color which set by splash screen, make it align to the app.
private void clearSystemBarColor() { private void clearSystemBarColor() {
if (mDecorView == null) { if (mDecorView == null || !mDecorView.isAttachedToWindow()) {
return; return;
} }
if (mDecorView.getLayoutParams() instanceof WindowManager.LayoutParams) { if (mDecorView.getLayoutParams() instanceof WindowManager.LayoutParams) {