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

AudioPlayerStateMonitor: fix NPE

Browse Source 
Use PLAYER_STATE_UNKNOWN for state passed to
sendAudioPlayerStateChangedMessageLocked() when prevState
is null in dispatchPlaybackConfigChange()

Bug: 68748062
Test: receive a call and check ringtone
Test: passed media cts
Change-Id: I9d4c84dc1d79a72afd06d044d00f682b70c86255
This commit is contained in:
Eric Laurent
2017-11-01 11:43:02 -07:00
committed by Sungsoo Lim
parent 875e697f9c
commit 46be72edc3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/media/AudioPlayerStateMonitor.java
View File

@@ -165,10 +165,13 @@ class AudioPlayerStateMonitor extends IPlaybackConfigDispatcher.Stub {
}
// Notify the change of audio player states.
for (AudioPlaybackConfiguration config : configs) {
Integer prevState = prevAudioPlayerStates.get(config.getPlayerInterfaceId());
if (prevState == null || prevState != config.getPlayerState()) {
final Integer prevState = prevAudioPlayerStates.get(config.getPlayerInterfaceId());
final int prevStateInt =
(prevState == null) ? AudioPlaybackConfiguration.PLAYER_STATE_UNKNOWN :
prevState.intValue();
if (prevStateInt != config.getPlayerState()) {
sendAudioPlayerStateChangedMessageLocked(
config.getClientUid(), prevState, config);
config.getClientUid(), prevStateInt, config);
}
}
for (Integer prevUid : prevAudioPlayersForUid.keySet()) {
@@ -176,9 +179,9 @@ class AudioPlayerStateMonitor extends IPlaybackConfigDispatcher.Stub {
// PLAYER_STATE_STARTED only when there were a player whose state was
// PLAYER_STATE_STARTED, otherwise any inactive state is okay to notify.
if (!mAudioPlayersForUid.containsKey(prevUid)) {
Set<Integer> players = mAudioPlayersForUid.get(prevUid);
Set<Integer> prevPlayers = prevAudioPlayersForUid.get(prevUid);
int prevState = AudioPlaybackConfiguration.PLAYER_STATE_UNKNOWN;
for (int pii : players) {
for (int pii : prevPlayers) {
Integer state = prevAudioPlayerStates.get(pii);
if (state == null) {
continue;