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

Merge "AudioService: log ducking and incall muting of audio players" into oc-mr1-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2017-10-04 18:33:42 +00:00
committed by Android (Google) Code Review
parent 77ee4f2ff2 74a5596a8a
commit df3e2be715
2 changed files with 57 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/audio/AudioEventLogger.java
View File

@@ -16,6 +16,8 @@
package com.android.server.audio; package com.android.server.audio;
import android.util.Log;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
@@ -46,6 +48,22 @@ public class AudioEventLogger {
.append(" ").append(eventToString()).toString(); .append(" ").append(eventToString()).toString();
} }
/**
* Causes the string message for the event to appear in the verbose logcat.
* Here is an example of how to create a new event (a StringEvent), adding it to the logger
* (an instance of AudioEventLogger) while also making it show in the verbose logcat:
* <pre>
* myLogger.log(
* (new StringEvent("something for logcat and logger")).printLog(MyClass.TAG) );
* </pre>
* @param tag the tag for the android.util.Log.v
* @return the same instance of the event
*/
public Event printLog(String tag) {
Log.v(tag, eventToString());
return this;
}
/** /**
* Convert event to String. * Convert event to String.
* This method is only called when the logger history is about to the dumped, * This method is only called when the logger history is about to the dumped,

55
services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
View File

@@ -114,7 +114,7 @@ public final class PlaybackActivityMonitor
if (index >= 0) { if (index >= 0) {
if (!disable) { if (!disable) {
if (DEBUG) { // hidden behind DEBUG, too noisy otherwise if (DEBUG) { // hidden behind DEBUG, too noisy otherwise
mEventLogger.log(new AudioEventLogger.StringEvent("unbanning uid:" + uid)); sEventLogger.log(new AudioEventLogger.StringEvent("unbanning uid:" + uid));
} }
mBannedUids.remove(index); mBannedUids.remove(index);
// nothing else to do, future playback requests from this uid are ok // nothing else to do, future playback requests from this uid are ok
@@ -125,7 +125,7 @@ public final class PlaybackActivityMonitor
checkBanPlayer(apc, uid); checkBanPlayer(apc, uid);
} }
if (DEBUG) { // hidden behind DEBUG, too noisy otherwise if (DEBUG) { // hidden behind DEBUG, too noisy otherwise
mEventLogger.log(new AudioEventLogger.StringEvent("banning uid:" + uid)); sEventLogger.log(new AudioEventLogger.StringEvent("banning uid:" + uid));
} }
mBannedUids.add(new Integer(uid)); mBannedUids.add(new Integer(uid));
} // no else to handle, uid already not in list, so enabling again is no-op } // no else to handle, uid already not in list, so enabling again is no-op
@@ -160,7 +160,7 @@ public final class PlaybackActivityMonitor
new AudioPlaybackConfiguration(pic, newPiid, new AudioPlaybackConfiguration(pic, newPiid,
Binder.getCallingUid(), Binder.getCallingPid()); Binder.getCallingUid(), Binder.getCallingPid());
apc.init(); apc.init();
mEventLogger.log(new NewPlayerEvent(apc)); sEventLogger.log(new NewPlayerEvent(apc));
synchronized(mPlayerLock) { synchronized(mPlayerLock) {
mPlayers.put(newPiid, apc); mPlayers.put(newPiid, apc);
} }
@@ -172,7 +172,7 @@ public final class PlaybackActivityMonitor
synchronized(mPlayerLock) { synchronized(mPlayerLock) {
final AudioPlaybackConfiguration apc = mPlayers.get(new Integer(piid)); final AudioPlaybackConfiguration apc = mPlayers.get(new Integer(piid));
if (checkConfigurationCaller(piid, apc, binderUid)) { if (checkConfigurationCaller(piid, apc, binderUid)) {
mEventLogger.log(new AudioAttrEvent(piid, attr)); sEventLogger.log(new AudioAttrEvent(piid, attr));
change = apc.handleAudioAttributesEvent(attr); change = apc.handleAudioAttributesEvent(attr);
} else { } else {
Log.e(TAG, "Error updating audio attributes"); Log.e(TAG, "Error updating audio attributes");
@@ -224,12 +224,12 @@ public final class PlaybackActivityMonitor
if (apc == null) { if (apc == null) {
return; return;
} }
mEventLogger.log(new PlayerEvent(piid, event)); sEventLogger.log(new PlayerEvent(piid, event));
if (event == AudioPlaybackConfiguration.PLAYER_STATE_STARTED) { if (event == AudioPlaybackConfiguration.PLAYER_STATE_STARTED) {
for (Integer uidInteger: mBannedUids) { for (Integer uidInteger: mBannedUids) {
if (checkBanPlayer(apc, uidInteger.intValue())) { if (checkBanPlayer(apc, uidInteger.intValue())) {
// player was banned, do not update its state // player was banned, do not update its state
mEventLogger.log(new AudioEventLogger.StringEvent( sEventLogger.log(new AudioEventLogger.StringEvent(
"not starting piid:" + piid + " ,is banned")); "not starting piid:" + piid + " ,is banned"));
return; return;
} }
@@ -258,7 +258,7 @@ public final class PlaybackActivityMonitor
public void playerHasOpPlayAudio(int piid, boolean hasOpPlayAudio, int binderUid) { public void playerHasOpPlayAudio(int piid, boolean hasOpPlayAudio, int binderUid) {
// no check on UID yet because this is only for logging at the moment // no check on UID yet because this is only for logging at the moment
mEventLogger.log(new PlayerOpPlayAudioEvent(piid, hasOpPlayAudio, binderUid)); sEventLogger.log(new PlayerOpPlayAudioEvent(piid, hasOpPlayAudio, binderUid));
} }
public void releasePlayer(int piid, int binderUid) { public void releasePlayer(int piid, int binderUid) {
@@ -266,7 +266,7 @@ public final class PlaybackActivityMonitor
synchronized(mPlayerLock) { synchronized(mPlayerLock) {
final AudioPlaybackConfiguration apc = mPlayers.get(new Integer(piid)); final AudioPlaybackConfiguration apc = mPlayers.get(new Integer(piid));
if (checkConfigurationCaller(piid, apc, binderUid)) { if (checkConfigurationCaller(piid, apc, binderUid)) {
mEventLogger.log(new AudioEventLogger.StringEvent( sEventLogger.log(new AudioEventLogger.StringEvent(
"releasing player piid:" + piid)); "releasing player piid:" + piid));
mPlayers.remove(new Integer(piid)); mPlayers.remove(new Integer(piid));
mDuckingManager.removeReleased(apc); mDuckingManager.removeReleased(apc);
@@ -321,7 +321,7 @@ public final class PlaybackActivityMonitor
} }
pw.println("\n"); pw.println("\n");
// log // log
mEventLogger.dump(pw); sEventLogger.dump(pw);
} }
} }
@@ -499,7 +499,8 @@ public final class PlaybackActivityMonitor
} }
if (mute) { if (mute) {
try { try {
Log.v(TAG, "call: muting player" + piid + " uid:" + apc.getClientUid()); sEventLogger.log((new AudioEventLogger.StringEvent("call: muting piid:"
+ piid + " uid:" + apc.getClientUid())).printLog(TAG));
apc.getPlayerProxy().setVolume(0.0f); apc.getPlayerProxy().setVolume(0.0f);
mMutedPlayers.add(new Integer(piid)); mMutedPlayers.add(new Integer(piid));
} catch (Exception e) { } catch (Exception e) {
@@ -523,7 +524,8 @@ public final class PlaybackActivityMonitor
final AudioPlaybackConfiguration apc = mPlayers.get(piid); final AudioPlaybackConfiguration apc = mPlayers.get(piid);
if (apc != null) { if (apc != null) {
try { try {
Log.v(TAG, "call: unmuting player" + piid + " uid:" + apc.getClientUid()); sEventLogger.log(new AudioEventLogger.StringEvent("call: unmuting piid:"
+ piid).printLog(TAG));
apc.getPlayerProxy().setVolume(1.0f); apc.getPlayerProxy().setVolume(1.0f);
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "call: error unmuting player " + piid + " uid:" Log.e(TAG, "call: error unmuting player " + piid + " uid:"
@@ -712,8 +714,7 @@ public final class PlaybackActivityMonitor
return; return;
} }
try { try {
Log.v(TAG, "ducking (skipRamp=" + skipRamp + ") player piid:" sEventLogger.log((new DuckEvent(apc, skipRamp)).printLog(TAG));
+ apc.getPlayerInterfaceId() + " uid:" + mUid);
apc.getPlayerProxy().applyVolumeShaper( apc.getPlayerProxy().applyVolumeShaper(
DUCK_VSHAPE, DUCK_VSHAPE,
skipRamp ? PLAY_SKIP_RAMP : PLAY_CREATE_IF_NEEDED); skipRamp ? PLAY_SKIP_RAMP : PLAY_CREATE_IF_NEEDED);
@@ -728,7 +729,8 @@ public final class PlaybackActivityMonitor
final AudioPlaybackConfiguration apc = players.get(piid); final AudioPlaybackConfiguration apc = players.get(piid);
if (apc != null) { if (apc != null) {
try { try {
Log.v(TAG, "unducking player " + piid + " uid:" + mUid); sEventLogger.log((new AudioEventLogger.StringEvent("unducking piid:"
+ piid)).printLog(TAG));
apc.getPlayerProxy().applyVolumeShaper( apc.getPlayerProxy().applyVolumeShaper(
DUCK_ID, DUCK_ID,
VolumeShaper.Operation.REVERSE); VolumeShaper.Operation.REVERSE);
@@ -815,7 +817,28 @@ public final class PlaybackActivityMonitor
} }
} }
private final static class AudioAttrEvent extends AudioEventLogger.Event { private static final class DuckEvent extends AudioEventLogger.Event {
private final int mPlayerIId;
private final boolean mSkipRamp;
private final int mClientUid;
private final int mClientPid;
DuckEvent(@NonNull AudioPlaybackConfiguration apc, boolean skipRamp) {
mPlayerIId = apc.getPlayerInterfaceId();
mSkipRamp = skipRamp;
mClientUid = apc.getClientUid();
mClientPid = apc.getClientPid();
}
@Override
public String eventToString() {
return new StringBuilder("ducking player piid:").append(mPlayerIId)
.append(" uid/pid:").append(mClientUid).append("/").append(mClientPid)
.append(" skip ramp:").append(mSkipRamp).toString();
}
}
private static final class AudioAttrEvent extends AudioEventLogger.Event {
private final int mPlayerIId; private final int mPlayerIId;
private final AudioAttributes mPlayerAttr; private final AudioAttributes mPlayerAttr;
@@ -830,6 +853,6 @@ public final class PlaybackActivityMonitor
} }
} }
private final AudioEventLogger mEventLogger = new AudioEventLogger(100, private static final AudioEventLogger sEventLogger = new AudioEventLogger(100,
"playback activity as reported through PlayerBase"); "playback activity as reported through PlayerBase");
} }