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

Fix potential crash when exit splash screen

Browse Source 
- Make sure mDecorView is attached before calling its
  WindowInsetsController.
- Amend modifier declare sequence for a better code style.

Bug: 258270145
Bug: 256766422
Test: atest SplashscreenTests StartingSurfaceDrawerTests
Change-Id: I4d3b184252ed9516827812adfa0c76e07a6527e7
Merged-In: I4d3b184252ed9516827812adfa0c76e07a6527e7
This commit is contained in:
Shen Lin
2022-11-09 17:16:12 +08:00
committed by Jane Ha
parent 4c71a7841c
commit 18646d5860
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

@@ -430,7 +430,8 @@ public class StartingSurfaceDrawer {
} }
@Override @Override
public @Nullable SplashScreenView get() { @Nullable
public SplashScreenView get() {
synchronized (this) { synchronized (this) {
while (!mIsViewSet) { while (!mIsViewSet) {
try { try {
@@ -691,7 +692,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;
@@ -732,7 +733,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) {