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

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

Browse Source 
* commit '6444fe121449f1cacf4500d3098b590c74e3646d':
  MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive
This commit is contained in:
Dongwon Kang
2015-07-20 23:57:22 +00:00
committed by Android Git Automerger
parent 1bc4330209 6444fe1214
commit dd82471598
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;
}
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.
if (useSuggested) {
if (AudioSystem.isStreamActive(stream, 0)) {
postAdjustSuggestedStreamVolume(stream, direction, flags, packageName, uid);
} else {
flags |= previousFlagPlaySound;
postAdjustSuggestedStreamVolume(AudioManager.USE_DEFAULT_STREAM_TYPE, direction,
flags, packageName, uid);
}
} else {
postAdjustStreamVolume(stream, direction, flags, packageName, uid);
}
int stream = AudioAttributes.toLegacyStreamType(mAudioAttrs);
postAdjustLocalVolume(stream, direction, flags, packageName, uid, useSuggested,
previousFlagPlaySound);
} else {
if (mVolumeControlType == VolumeProvider.VOLUME_CONTROL_FIXED) {
// Nothing to do, the volume cannot be changed
@@ -459,24 +450,25 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {
return mPackageName + "/" + mTag;
}
private void postAdjustSuggestedStreamVolume(final int streamType, final int direction,
final int flags, final String callingPackage, final int uid) {
private void postAdjustLocalVolume(final int stream, final int direction, final int flags,
final String packageName, final int uid, final boolean useSuggested,
final int previousFlagPlaySound) {
mHandler.post(new Runnable() {
@Override
public void run() {
mAudioManagerInternal.adjustSuggestedStreamVolumeForUid(streamType, direction,
flags, callingPackage, uid);
}
});
}
private void postAdjustStreamVolume(final int streamType, final int direction, final int flags,
final String callingPackage, final int uid) {
mHandler.post(new Runnable() {
@Override
public void run() {
mAudioManagerInternal.adjustStreamVolumeForUid(streamType, direction, flags,
callingPackage, uid);
if (useSuggested) {
if (AudioSystem.isStreamActive(stream, 0)) {
mAudioManagerInternal.adjustSuggestedStreamVolumeForUid(stream, direction,
flags, packageName, uid);
} else {
mAudioManagerInternal.adjustSuggestedStreamVolumeForUid(
AudioManager.USE_DEFAULT_STREAM_TYPE, direction,
flags | previousFlagPlaySound, packageName, uid);
}
} else {
mAudioManagerInternal.adjustStreamVolumeForUid(stream, direction, flags,
packageName, uid);
}
}
});
}