diff options
author | Jae Seo <jaeseo@google.com> | 2015-07-20 20:45:07 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-20 20:45:11 +0000 |
commit | 26f7720ed0d6a0894772d82b7ebed03ac686c6f3 (patch) | |
tree | e3fff29754feb64c5be38a550103cd709c529c0d /services/core/java/com/android/server/media | |
parent | 35ba2cdbf8654d708e57d209131dd498705d0e18 (diff) | |
parent | d2a8d71ce0eeb14034ec779a00e5ff6a0e173fb4 (diff) | |
download | frameworks_base-26f7720ed0d6a0894772d82b7ebed03ac686c6f3.zip frameworks_base-26f7720ed0d6a0894772d82b7ebed03ac686c6f3.tar.gz frameworks_base-26f7720ed0d6a0894772d82b7ebed03ac686c6f3.tar.bz2 |
Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev
Diffstat (limited to 'services/core/java/com/android/server/media')
-rw-r--r-- | services/core/java/com/android/server/media/MediaSessionRecord.java | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java index 569a0fc..7f5360b 100644 --- a/services/core/java/com/android/server/media/MediaSessionRecord.java +++ b/services/core/java/com/android/server/media/MediaSessionRecord.java @@ -1067,23 +1067,22 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { @Override public ParcelableVolumeInfo getVolumeAttributes() { + int volumeType; + AudioAttributes attributes; synchronized (mLock) { - int type; - int max; - int current; if (mVolumeType == PlaybackInfo.PLAYBACK_TYPE_REMOTE) { - type = mVolumeControlType; - max = mMaxVolume; - current = mOptimisticVolume != -1 ? mOptimisticVolume - : mCurrentVolume; - } else { - int stream = AudioAttributes.toLegacyStreamType(mAudioAttrs); - type = VolumeProvider.VOLUME_CONTROL_ABSOLUTE; - max = mAudioManager.getStreamMaxVolume(stream); - current = mAudioManager.getStreamVolume(stream); + int current = mOptimisticVolume != -1 ? mOptimisticVolume : mCurrentVolume; + return new ParcelableVolumeInfo( + mVolumeType, mAudioAttrs, mVolumeControlType, mMaxVolume, current); } - 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 |