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

Merge "Tweak the selection of media button session" into qt-dev

Browse Source
This commit is contained in:
Sungsoo Lim
2019-04-15 05:55:27 +00:00
committed by Android (Google) Code Review
parent 88774ef6eb cc19772447
commit a498804d40
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,7 +142,8 @@ class AudioPlayerStateMonitor {
/** /**
* Returns the sorted list of UIDs that have had active audio playback. (i.e. playing an * Returns the sorted list of UIDs that have had active audio playback. (i.e. playing an
* audio/video) The UID whose audio playback becomes active at the last comes first. * audio/video) The UID whose audio is currently playing comes first, then the UID whose audio
* playback becomes active at the last comes next.
*/ */
public IntArray getSortedAudioPlaybackClientUids() { public IntArray getSortedAudioPlaybackClientUids() {
IntArray sortedAudioPlaybackClientUids = new IntArray(); IntArray sortedAudioPlaybackClientUids = new IntArray();
@@ -253,6 +254,26 @@ class AudioPlayerStateMonitor {
mSortedAudioPlaybackClientUids.add(0, uid); mSortedAudioPlaybackClientUids.add(0, uid);
} }
} }
if (mActiveAudioUids.size() > 0
&& !mActiveAudioUids.contains(mSortedAudioPlaybackClientUids.get(0))) {
int firstActiveUid = -1;
int firatActiveUidIndex = -1;
for (int i = 1; i < mSortedAudioPlaybackClientUids.size(); ++i) {
int uid = mSortedAudioPlaybackClientUids.get(i);
if (mActiveAudioUids.contains(uid)) {
firatActiveUidIndex = i;
firstActiveUid = uid;
break;
}
}
for (int i = firatActiveUidIndex; i > 0; --i) {
mSortedAudioPlaybackClientUids.set(i,
mSortedAudioPlaybackClientUids.get(i - 1));
}
mSortedAudioPlaybackClientUids.set(0, firstActiveUid);
}
// Notify the active state change of audio players. // Notify the active state change of audio players.
for (AudioPlaybackConfiguration config : configs) { for (AudioPlaybackConfiguration config : configs) {
final int pii = config.getPlayerInterfaceId(); final int pii = config.getPlayerInterfaceId();

2
services/core/java/com/android/server/media/MediaSessionServiceImpl.java
View File

@@ -171,7 +171,7 @@ public class MediaSessionServiceImpl extends MediaSessionService.ServiceImpl {
mAudioPlayerStateMonitor = AudioPlayerStateMonitor.getInstance(mContext); mAudioPlayerStateMonitor = AudioPlayerStateMonitor.getInstance(mContext);
mAudioPlayerStateMonitor.registerListener( mAudioPlayerStateMonitor.registerListener(
(config, isRemoved) -> { (config, isRemoved) -> {
if (isRemoved || !config.isActive() || config.getPlayerType() if (config.getPlayerType()
== AudioPlaybackConfiguration.PLAYER_TYPE_JAM_SOUNDPOOL) { == AudioPlaybackConfiguration.PLAYER_TYPE_JAM_SOUNDPOOL) {
return; return;
} }