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

Add null-check to PlayerView to avoid NPE in edit mode

Browse Source 
Previously we assumed that `surfaceSyncGroupV34` was always non-null on
API 34, but this isn't true in edit mode. Instead we add an explicit
null-check before accessing it. We don't need to null-check it at the
other usage site because we are already null-checking `surfaceView` (via
`instanceof` check).

Issue: androidx/media#1237

#cherrypick

PiperOrigin-RevId: 645008049
This commit is contained in:
ibaker 2024-06-20 06:28:04 -07:00 committed by Copybara-Service
parent 307655f6d5
commit 99803066ea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/ui/src/main/java/androidx/media3/ui/PlayerView.java
View File

@ -1783,8 +1783,8 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
@Override @Override
protected void dispatchDraw(Canvas canvas) { protected void dispatchDraw(Canvas canvas) {
super.dispatchDraw(canvas); super.dispatchDraw(canvas);
if (Util.SDK_INT == 34) { if (Util.SDK_INT == 34 && surfaceSyncGroupV34 != null) {
checkNotNull(surfaceSyncGroupV34).maybeMarkSyncReadyAndClear(); surfaceSyncGroupV34.maybeMarkSyncReadyAndClear();
} }
} }