diff options
| -rw-r--r-- | services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java | 18 | ||||
| -rw-r--r-- | services/core/java/com/android/server/media/MediaRoute2ProviderWatcher.java | 13 |
2 files changed, 20 insertions, 11 deletions
diff --git a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java index c6f89750e87c..be1ade8818f9 100644 --- a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java +++ b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java @@ -84,12 +84,7 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider } public void dump(PrintWriter pw, String prefix) { - pw.println(prefix + "Proxy"); - pw.println(prefix + " mUserId=" + mUserId); - pw.println(prefix + " mRunning=" + mRunning); - pw.println(prefix + " mBound=" + mBound); - pw.println(prefix + " mActiveConnection=" + mActiveConnection); - pw.println(prefix + " mConnectionReady=" + mConnectionReady); + pw.println(prefix + getDebugString()); } public void setManagerScanning(boolean managerScanning) { @@ -494,7 +489,16 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider @Override public String toString() { - return "Service connection " + mComponentName.flattenToShortString(); + return getDebugString(); + } + + private String getDebugString() { + return TextUtils.formatSimple( + "ProviderServiceProxy - package: %s, bound: %b, connection (active:%b, ready:%b)", + mComponentName.getPackageName(), + mBound, + mActiveConnection != null, + mConnectionReady); } private final class Connection implements DeathRecipient { diff --git a/services/core/java/com/android/server/media/MediaRoute2ProviderWatcher.java b/services/core/java/com/android/server/media/MediaRoute2ProviderWatcher.java index c8697b48b515..46bccaf314d9 100644 --- a/services/core/java/com/android/server/media/MediaRoute2ProviderWatcher.java +++ b/services/core/java/com/android/server/media/MediaRoute2ProviderWatcher.java @@ -63,10 +63,15 @@ final class MediaRoute2ProviderWatcher { } public void dump(PrintWriter pw, String prefix) { - pw.println(prefix + "Watcher"); - pw.println(prefix + " mUserId=" + mUserId); - pw.println(prefix + " mRunning=" + mRunning); - pw.println(prefix + " mProxies.size()=" + mProxies.size()); + pw.println(prefix + "MediaRoute2ProviderWatcher"); + prefix += " "; + if (mProxies.isEmpty()) { + pw.println(prefix + "<no provider service proxies>"); + } else { + for (MediaRoute2ProviderServiceProxy proxy : mProxies) { + proxy.dump(pw, prefix); + } + } } public void start() { |