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

Merge "AudioService: better mic muting API behavior with errors"

Browse Source
This commit is contained in:
Jean-Michel Trivi
2020-04-13 18:17:44 +00:00
committed by Android (Google) Code Review
parent 409ef11a0c 14e3485272
commit 52076ad502
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -574,6 +574,8 @@ public class AudioService extends IAudioService.Stub
private boolean mMicMuteFromSwitch;
private boolean mMicMuteFromApi;
private boolean mMicMuteFromRestrictions;
// caches the value returned by AudioSystem.isMicrophoneMuted()
private boolean mMicMuteFromSystemCached;
@GuardedBy("mSettingsLock")
private int mAssistantUid;
@@ -934,6 +936,7 @@ public class AudioService extends IAudioService.Stub
onIndicateSystemReady();
mMicMuteFromSystemCached = AudioSystem.isMicrophoneMuted();
setMicMuteFromSwitchInput();
}
@@ -1127,6 +1130,7 @@ public class AudioService extends IAudioService.Stub
sendMsg(mAudioHandler, MSG_DISPATCH_AUDIO_SERVER_STATE,
SENDMSG_QUEUE, 1, 0, null, 0);
setMicrophoneMuteNoCallerCheck(getCurrentUserId()); // will also update the mic mute cache
setMicMuteFromSwitchInput();
}
@@ -3223,12 +3227,20 @@ public class AudioService extends IAudioService.Stub
}
}
/**
* Returns the microphone mute state as seen from the native audio system
* @return true if microphone is reported as muted by primary HAL
*/
public boolean isMicrophoneMuted() {
return mMicMuteFromSystemCached;
}
private boolean isMicrophoneSupposedToBeMuted() {
return mMicMuteFromSwitch || mMicMuteFromRestrictions || mMicMuteFromApi;
}
private void setMicrophoneMuteNoCallerCheck(int userId) {
final boolean muted = isMicrophoneMuted();
final boolean muted = isMicrophoneSupposedToBeMuted();
if (DEBUG_VOL) {
Log.d(TAG, String.format("Mic mute %b, user=%d", muted, userId));
}
@@ -3236,7 +3248,7 @@ public class AudioService extends IAudioService.Stub
if (getCurrentUserId() == userId || userId == android.os.Process.SYSTEM_UID) {
final boolean currentMute = AudioSystem.isMicrophoneMuted();
final long identity = Binder.clearCallingIdentity();
AudioSystem.muteMicrophone(muted);
final int ret = AudioSystem.muteMicrophone(muted);
new MediaMetrics.Item(mAnalyticsId + "setMicrophoneMuteNoCallerCheck")
.setUid(userId)
@@ -3244,7 +3256,19 @@ public class AudioService extends IAudioService.Stub
.putInt("currentMute", currentMute ? 1 : 0)
.putLong("identity", identity)
.record();
// update cache with the real state independently from what was set
mMicMuteFromSystemCached = AudioSystem.isMicrophoneMuted();
if (ret != AudioSystem.AUDIO_STATUS_OK) {
Log.e(TAG, "Error changing mic mute state to " + muted + " current:"
+ mMicMuteFromSystemCached);
}
try {
// send the intent even if there was a failure to change the actual mute state:
// the AudioManager.setMicrophoneMute API doesn't have a return value to
// indicate if the call failed to successfully change the mute state, and receiving
// the intent may be the only time an application can resynchronize its mic mute
// state with the actual system mic mute state
if (muted != currentMute) {
sendMsg(mAudioHandler, MSG_BROADCAST_MICROPHONE_MUTE,
SENDMSG_NOOP, 0, 0, null, 0);
@@ -7154,6 +7178,10 @@ public class AudioService extends IAudioService.Stub
pw.print(" mHdmiTvClient="); pw.println(mHdmiTvClient);
pw.print(" mHdmiSystemAudioSupported="); pw.println(mHdmiSystemAudioSupported);
pw.print(" mIsCallScreeningModeSupported="); pw.println(mIsCallScreeningModeSupported);
pw.print(" mic mute FromSwitch=" + mMicMuteFromSwitch
+ " FromRestrictions=" + mMicMuteFromRestrictions
+ " FromApi=" + mMicMuteFromApi
+ " from system=" + mMicMuteFromSystemCached);
dumpAudioPolicies(pw);
mDynPolicyLogger.dump(pw);