loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tolerate the result of View.getLayoutParams being null

Browse Source 
PiperOrigin-RevId: 437017422
This commit is contained in:
ibaker 2022-03-24 16:47:44 +00:00 committed by Ian Baker
parent a11adbc08c
commit 90d1c6fc33
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/ui/src/main/java/androidx/media3/ui/PlayerControlViewLayoutManager.java
View File

@ -598,21 +598,21 @@ import java.util.List;
return width <= defaultModeMinimumWidth || height <= defaultModeMinimumHeight; return width <= defaultModeMinimumWidth || height <= defaultModeMinimumHeight;
} }
// dereference of possibly-null reference timeBarParams
@SuppressWarnings("nullness:dereference.of.nullable")
private void updateLayoutForSizeChange() { private void updateLayoutForSizeChange() {
if (minimalControls != null) { if (minimalControls != null) {
minimalControls.setVisibility(isMinimalMode ? View.VISIBLE : View.INVISIBLE); minimalControls.setVisibility(isMinimalMode ? View.VISIBLE : View.INVISIBLE);
} }
if (timeBar != null) { if (timeBar != null) {
MarginLayoutParams timeBarParams = (MarginLayoutParams) timeBar.getLayoutParams();
int timeBarMarginBottom = int timeBarMarginBottom =
playerControlView playerControlView
.getResources() .getResources()
.getDimensionPixelSize(R.dimen.exo_styled_progress_margin_bottom); .getDimensionPixelSize(R.dimen.exo_styled_progress_margin_bottom);
timeBarParams.bottomMargin = (isMinimalMode ? 0 : timeBarMarginBottom); @Nullable MarginLayoutParams timeBarParams = (MarginLayoutParams) timeBar.getLayoutParams();
timeBar.setLayoutParams(timeBarParams); if (timeBarParams != null) {
timeBarParams.bottomMargin = (isMinimalMode ? 0 : timeBarMarginBottom);
timeBar.setLayoutParams(timeBarParams);
}
if (timeBar instanceof DefaultTimeBar) { if (timeBar instanceof DefaultTimeBar) {
DefaultTimeBar defaultTimeBar = (DefaultTimeBar) timeBar; DefaultTimeBar defaultTimeBar = (DefaultTimeBar) timeBar;
if (isMinimalMode) { if (isMinimalMode) {