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

Merge "AudioService: better vol adjustment logs" into qt-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2019-04-15 16:42:06 +00:00
committed by Android (Google) Code Review
parent 848eab444c 8505b2303d
commit ddba88ea71
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1523,9 +1523,11 @@ public class AudioService extends IAudioService.Stub
+ ", flags=" + flags + ", caller=" + caller + ", flags=" + flags + ", caller=" + caller
+ ", volControlStream=" + mVolumeControlStream + ", volControlStream=" + mVolumeControlStream
+ ", userSelect=" + mUserSelectedVolumeControlStream); + ", userSelect=" + mUserSelectedVolumeControlStream);
sVolumeLogger.log(new VolumeEvent(VolumeEvent.VOL_ADJUST_SUGG_VOL, suggestedStreamType, if (direction != AudioManager.ADJUST_SAME) {
direction/*val1*/, flags/*val2*/, new StringBuilder(callingPackage) sVolumeLogger.log(new VolumeEvent(VolumeEvent.VOL_ADJUST_SUGG_VOL, suggestedStreamType,
.append("/").append(caller).append(" uid:").append(uid).toString())); direction/*val1*/, flags/*val2*/, new StringBuilder(callingPackage)
.append("/").append(caller).append(" uid:").append(uid).toString()));
}
final int streamType; final int streamType;
synchronized (mForceControlStreamLock) { synchronized (mForceControlStreamLock) {
// Request lock in case mVolumeControlStream is changed by other thread. // Request lock in case mVolumeControlStream is changed by other thread.
@@ -6320,6 +6322,11 @@ public class AudioService extends IAudioService.Stub
@Override @Override
public void adjustStreamVolumeForUid(int streamType, int direction, int flags, public void adjustStreamVolumeForUid(int streamType, int direction, int flags,
String callingPackage, int uid) { String callingPackage, int uid) {
if (direction != AudioManager.ADJUST_SAME) {
sVolumeLogger.log(new VolumeEvent(VolumeEvent.VOL_ADJUST_VOL_UID, streamType,
direction/*val1*/, flags/*val2*/, new StringBuilder(callingPackage)
.append(" uid:").append(uid).toString()));
}
adjustStreamVolume(streamType, direction, flags, callingPackage, adjustStreamVolume(streamType, direction, flags, callingPackage,
callingPackage, uid); callingPackage, uid);
} }

8
services/core/java/com/android/server/audio/AudioServiceEvents.java
View File

@@ -94,6 +94,7 @@ public class AudioServiceEvents {
static final int VOL_SET_STREAM_VOL = 2; static final int VOL_SET_STREAM_VOL = 2;
static final int VOL_SET_HEARING_AID_VOL = 3; static final int VOL_SET_HEARING_AID_VOL = 3;
static final int VOL_SET_AVRCP_VOL = 4; static final int VOL_SET_AVRCP_VOL = 4;
static final int VOL_ADJUST_VOL_UID = 5;
final int mOp; final int mOp;
final int mStream; final int mStream;
@@ -160,6 +161,13 @@ public class AudioServiceEvents {
return new StringBuilder("setAvrcpVolume:") return new StringBuilder("setAvrcpVolume:")
.append(" index:").append(mVal1) .append(" index:").append(mVal1)
.toString(); .toString();
case VOL_ADJUST_VOL_UID:
return new StringBuilder("adjustStreamVolumeForUid(stream:")
.append(AudioSystem.streamToString(mStream))
.append(" dir:").append(AudioManager.adjustToString(mVal1))
.append(" flags:0x").append(Integer.toHexString(mVal2))
.append(") from ").append(mCaller)
.toString();
default: return new StringBuilder("FIXME invalid op:").append(mOp).toString(); default: return new StringBuilder("FIXME invalid op:").append(mOp).toString();
} }
} }