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

Merge "Enable phone apps to mute the BLUETOOTH_SCO stream" am: 09d13a2232

Browse Source 
am: b0395aca6a

Change-Id: I1656753897ff28a9ff9096fee0ba9928623e75ad
This commit is contained in:
Tomoharu Kasahara
2019-01-22 19:02:31 -08:00
committed by android-build-merger
parent 3fb943a7b5 b0395aca6a
commit b442507023
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/java/android/media/AudioSystem.java
View File

@@ -1010,7 +1010,8 @@ public class AudioSystem
(1 << STREAM_RING) |
(1 << STREAM_NOTIFICATION) |
(1 << STREAM_SYSTEM) |
(1 << STREAM_VOICE_CALL);
(1 << STREAM_VOICE_CALL) |
(1 << STREAM_BLUETOOTH_SCO);
/**
* Event posted by AudioTrack and AudioRecord JNI (JNIDeviceCallback) when routing changes.

17
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -1163,11 +1163,13 @@ public class AudioService extends IAudioService.Stub
private void checkMuteAffectedStreams() {
// any stream with a min level > 0 is not muteable by definition
// STREAM_VOICE_CALL can be muted by applications that has the the MODIFY_PHONE_STATE permission.
// STREAM_VOICE_CALL and STREAM_BLUETOOTH_SCO can be muted by applications
// that has the the MODIFY_PHONE_STATE permission.
for (int i = 0; i < mStreamStates.length; i++) {
final VolumeStreamState vss = mStreamStates[i];
if (vss.mIndexMin > 0 &&
vss.mStreamType != AudioSystem.STREAM_VOICE_CALL) {
(vss.mStreamType != AudioSystem.STREAM_VOICE_CALL &&
vss.mStreamType != AudioSystem.STREAM_BLUETOOTH_SCO)) {
mMuteAffectedStreams &= ~(1 << vss.mStreamType);
}
}
@@ -1617,10 +1619,11 @@ public class AudioService extends IAudioService.Stub
return;
}
// If adjust is mute and the stream is STREAM_VOICE_CALL, make sure
// If adjust is mute and the stream is STREAM_VOICE_CALL or STREAM_BLUETOOTH_SCO, make sure
// that the calling app have the MODIFY_PHONE_STATE permission.
if (isMuteAdjust &&
streamType == AudioSystem.STREAM_VOICE_CALL &&
(streamType == AudioSystem.STREAM_VOICE_CALL ||
streamType == AudioSystem.STREAM_BLUETOOTH_SCO) &&
mContext.checkCallingOrSelfPermission(
android.Manifest.permission.MODIFY_PHONE_STATE)
!= PackageManager.PERMISSION_GRANTED) {
@@ -1937,12 +1940,14 @@ public class AudioService extends IAudioService.Stub
+ " CHANGE_ACCESSIBILITY_VOLUME callingPackage=" + callingPackage);
return;
}
if ((streamType == AudioManager.STREAM_VOICE_CALL) &&
if ((streamType == AudioManager.STREAM_VOICE_CALL ||
streamType == AudioManager.STREAM_BLUETOOTH_SCO) &&
(index == 0) &&
(mContext.checkCallingOrSelfPermission(
android.Manifest.permission.MODIFY_PHONE_STATE)
!= PackageManager.PERMISSION_GRANTED)) {
Log.w(TAG, "Trying to call setStreamVolume() for STREAM_VOICE_CALL and index 0 without"
Log.w(TAG, "Trying to call setStreamVolume() for STREAM_VOICE_CALL or"
+ " STREAM_BLUETOOTH_SCO and index 0 without"
+ " MODIFY_PHONE_STATE callingPackage=" + callingPackage);
return;
}