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

This commit is contained in:
Wei Sheng Shih
2022-03-01 05:27:14 +00:00
committed by Android (Google) Code Review

View File

@@ -364,6 +364,12 @@ public class StartingSurfaceDrawer {
final StartingWindowRecord record = mStartingWindowRecords.get(taskId);
final SplashScreenView contentView = viewSupplier.get();
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) {
// don't crash if something else bad happens, for example a