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

Cache the Binder call for PlaybackState

Browse Source 
It's rare but possible that the 2nd Binder call returns a different
value than the 1st one, fix the potential NPE by caching the return
value of MediaController#getPlaybackState

Bug: 283583998
Test: N/A
Change-Id: I9e8f456f3817f68dd98f637a1ee4a7d6d109801e
This commit is contained in:
Hongwei Wang
2023-05-22 14:29:27 -07:00
parent b03c480d4b
commit a5ad327f45
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipMediaController.java
View File

@@ -252,13 +252,16 @@ public class PipMediaController {
// It can be removed when min_sdk of the app is set to 31 or greater.
@SuppressLint("NewApi")
private List<RemoteAction> getMediaActions() {
if (mMediaController == null || mMediaController.getPlaybackState() == null) {
// Cache the PlaybackState since it's a Binder call.
final PlaybackState playbackState;
if (mMediaController == null
|| (playbackState = mMediaController.getPlaybackState()) == null) {
return Collections.emptyList();
}
ArrayList<RemoteAction> mediaActions = new ArrayList<>();
boolean isPlaying = mMediaController.getPlaybackState().isActive();
long actions = mMediaController.getPlaybackState().getActions();
boolean isPlaying = playbackState.isActive();
long actions = playbackState.getActions();
// Prev action
mPrevAction.setEnabled((actions & PlaybackState.ACTION_SKIP_TO_PREVIOUS) != 0);