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

Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev

Browse Source
This commit is contained in:
Jae Seo
2015-07-20 20:45:07 +00:00
committed by Android (Google) Code Review
parent 35ba2cdbf8 d2a8d71ce0
commit 26f7720ed0
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1067,23 +1067,22 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {
@Override @Override
public ParcelableVolumeInfo getVolumeAttributes() { public ParcelableVolumeInfo getVolumeAttributes() {
int volumeType;
AudioAttributes attributes;
synchronized (mLock) { synchronized (mLock) {
int type;
int max;
int current;
if (mVolumeType == PlaybackInfo.PLAYBACK_TYPE_REMOTE) { if (mVolumeType == PlaybackInfo.PLAYBACK_TYPE_REMOTE) {
type = mVolumeControlType; int current = mOptimisticVolume != -1 ? mOptimisticVolume : mCurrentVolume;
max = mMaxVolume; return new ParcelableVolumeInfo(
current = mOptimisticVolume != -1 ? mOptimisticVolume mVolumeType, mAudioAttrs, mVolumeControlType, mMaxVolume, current);
: mCurrentVolume;
} else {
int stream = AudioAttributes.toLegacyStreamType(mAudioAttrs);
type = VolumeProvider.VOLUME_CONTROL_ABSOLUTE;
max = mAudioManager.getStreamMaxVolume(stream);
current = mAudioManager.getStreamVolume(stream);
} }
return new ParcelableVolumeInfo(mVolumeType, mAudioAttrs, type, max, current); volumeType = mVolumeType;
attributes = mAudioAttrs;
} }
int stream = AudioAttributes.toLegacyStreamType(attributes);
int max = mAudioManager.getStreamMaxVolume(stream);
int current = mAudioManager.getStreamVolume(stream);
return new ParcelableVolumeInfo(
volumeType, attributes, VolumeProvider.VOLUME_CONTROL_ABSOLUTE, max, current);
} }
@Override @Override