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

Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev

Browse Source
This commit is contained in:
Dongwon Kang
2015-07-20 23:49:59 +00:00
committed by Android (Google) Code Review
parent 55786e1164 500747bf8f
commit 6444fe1214
1 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
services/core/java/com/android/server/media/MediaSessionRecord.java
View File

@@ -241,19 +241,10 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {
flags &= ~AudioManager.FLAG_PLAY_SOUND; flags &= ~AudioManager.FLAG_PLAY_SOUND;
} }
if (mVolumeType == PlaybackInfo.PLAYBACK_TYPE_LOCAL) { if (mVolumeType == PlaybackInfo.PLAYBACK_TYPE_LOCAL) {
int stream = AudioAttributes.toLegacyStreamType(mAudioAttrs);
// Adjust the volume with a handler not to be blocked by other system service. // Adjust the volume with a handler not to be blocked by other system service.
if (useSuggested) { int stream = AudioAttributes.toLegacyStreamType(mAudioAttrs);
if (AudioSystem.isStreamActive(stream, 0)) { postAdjustLocalVolume(stream, direction, flags, packageName, uid, useSuggested,
postAdjustSuggestedStreamVolume(stream, direction, flags, packageName, uid); previousFlagPlaySound);
} else {
flags |= previousFlagPlaySound;
postAdjustSuggestedStreamVolume(AudioManager.USE_DEFAULT_STREAM_TYPE, direction,
flags, packageName, uid);
}
} else {
postAdjustStreamVolume(stream, direction, flags, packageName, uid);
}
} else { } else {
if (mVolumeControlType == VolumeProvider.VOLUME_CONTROL_FIXED) { if (mVolumeControlType == VolumeProvider.VOLUME_CONTROL_FIXED) {
// Nothing to do, the volume cannot be changed // Nothing to do, the volume cannot be changed
@@ -459,24 +450,25 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {
return mPackageName + "/" + mTag; return mPackageName + "/" + mTag;
} }
private void postAdjustSuggestedStreamVolume(final int streamType, final int direction, private void postAdjustLocalVolume(final int stream, final int direction, final int flags,
final int flags, final String callingPackage, final int uid) { final String packageName, final int uid, final boolean useSuggested,
final int previousFlagPlaySound) {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
mAudioManagerInternal.adjustSuggestedStreamVolumeForUid(streamType, direction, if (useSuggested) {
flags, callingPackage, uid); if (AudioSystem.isStreamActive(stream, 0)) {
} mAudioManagerInternal.adjustSuggestedStreamVolumeForUid(stream, direction,
}); flags, packageName, uid);
} } else {
mAudioManagerInternal.adjustSuggestedStreamVolumeForUid(
private void postAdjustStreamVolume(final int streamType, final int direction, final int flags, AudioManager.USE_DEFAULT_STREAM_TYPE, direction,
final String callingPackage, final int uid) { flags | previousFlagPlaySound, packageName, uid);
mHandler.post(new Runnable() { }
@Override } else {
public void run() { mAudioManagerInternal.adjustStreamVolumeForUid(stream, direction, flags,
mAudioManagerInternal.adjustStreamVolumeForUid(streamType, direction, flags, packageName, uid);
callingPackage, uid); }
} }
}); });
} }