Merge "Add usage to CarAudoFocus dumpsys and logs" into qt-qpr1-dev am: 6615a7fb11
Change-Id: I0276b8e3ebcb9e0f64633e266d9a9f784bf314e3
diff --git a/service/src/com/android/car/audio/CarAudioFocus.java b/service/src/com/android/car/audio/CarAudioFocus.java
index 165caad..286a045 100644
--- a/service/src/com/android/car/audio/CarAudioFocus.java
+++ b/service/src/com/android/car/audio/CarAudioFocus.java
@@ -113,6 +113,10 @@
mAfi.getPackageName())
== PackageManager.PERMISSION_GRANTED);
}
+
+ String getUsageName() {
+ return mAfi.getAttributes().usageToString();
+ }
}
@@ -171,8 +175,9 @@
// The default audio framework's behavior is to remove the previous entry in the stack (no-op
// if the requester is already holding focus).
int evaluateFocusRequest(AudioFocusInfo afi) {
- Log.i(TAG, "Evaluating " + focusEventToString(afi.getGainRequest()) + " request for client "
- + afi.getClientId());
+ Log.i(TAG, "Evaluating " + focusEventToString(afi.getGainRequest())
+ + " request for client " + afi.getClientId()
+ + " with usage " + afi.getAttributes().usageToString());
// Is this a request for premanant focus?
// AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE -- Means Notifications should be denied
@@ -588,14 +593,17 @@
public synchronized void dump(String indent, PrintWriter writer) {
writer.printf("%s*CarAudioFocus*\n", indent);
- writer.printf("%s\tCurrent Focus Holders:\n", indent);
+ String innerIndent = indent + "\t";
+ writer.printf("%sCurrent Focus Holders:\n", innerIndent);
for (String clientId : mFocusHolders.keySet()) {
- writer.printf("%s\t\t%s\n", indent, clientId);
+ writer.printf("%s\t%s - %s\n", innerIndent, clientId,
+ mFocusHolders.get(clientId).getUsageName());
}
- writer.printf("%s\tTransient Focus Losers:\n", indent);
+ writer.printf("%sTransient Focus Losers:\n", innerIndent);
for (String clientId : mFocusLosers.keySet()) {
- writer.printf("%s\t\t%s\n", indent, clientId);
+ writer.printf("%s\t%s - %s\n", innerIndent, clientId,
+ mFocusLosers.get(clientId).getUsageName());
}
}