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

Merge "Release the surface control view host when addWindow fail." into tm-dev am: e3ae5cda82

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16939196

Change-Id: Id5fd4a1a9dc930036421a933de18444497e91642
This commit is contained in:
Wei Sheng Shih
2022-03-01 05:36:07 +00:00
committed by Automerger Merge Worker
parent a2f3b52f75 e3ae5cda82
commit 23ce8aeec7
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -364,6 +364,12 @@ public class StartingSurfaceDrawer {
final StartingWindowRecord record = mStartingWindowRecords.get(taskId); final StartingWindowRecord record = mStartingWindowRecords.get(taskId);
final SplashScreenView contentView = viewSupplier.get(); final SplashScreenView contentView = viewSupplier.get();
record.mBGColor = contentView.getInitBackgroundColor(); record.mBGColor = contentView.getInitBackgroundColor();
} else {
// release the icon view host
final SplashScreenView contentView = viewSupplier.get();
if (contentView.getSurfaceHost() != null) {
SplashScreenView.releaseIconHost(contentView.getSurfaceHost());
}
} }
} catch (RuntimeException e) { } catch (RuntimeException e) {
// don't crash if something else bad happens, for example a // don't crash if something else bad happens, for example a