diff --git a/media/java/android/media/RouteDiscoveryPreference.java b/media/java/android/media/RouteDiscoveryPreference.java index 207460af140c5..71d8261b09bfc 100644 --- a/media/java/android/media/RouteDiscoveryPreference.java +++ b/media/java/android/media/RouteDiscoveryPreference.java @@ -24,6 +24,8 @@ import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; +import java.io.FileDescriptor; +import java.io.PrintWriter; import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -180,6 +182,24 @@ public final class RouteDiscoveryPreference implements Parcelable { dest.writeBundle(mExtras); } + /** + * Dumps current state of the instance. Use with {@code dumpsys}. + * + * See {@link android.os.Binder#dump(FileDescriptor, PrintWriter, String[])}. + * + * @hide + */ + public void dump(@NonNull PrintWriter pw, @NonNull String prefix) { + pw.println(prefix + "RouteDiscoveryPreference"); + + String indent = prefix + " "; + + pw.println(indent + "mPreferredFeatures=" + mPreferredFeatures); + pw.println(indent + "mPackageOrder=" + mPackageOrder); + pw.println(indent + "mAllowedPackages=" + mAllowedPackages); + pw.println(indent + "mExtras=" + mExtras); + } + @Override public String toString() { StringBuilder result = new StringBuilder() diff --git a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java index 54ed54ef771ef..1fdf3941376aa 100644 --- a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java +++ b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java @@ -1242,6 +1242,8 @@ class MediaRouter2ServiceImpl { pw.println(indent + ""); } + mCompositeDiscoveryPreference.dump(pw, indent); + if (!mHandler.runWithScissors(() -> mHandler.dump(pw, indent), 1000)) { pw.println(indent + ""); } @@ -1299,6 +1301,8 @@ class MediaRouter2ServiceImpl { pw.println(indent + "mHasModifyAudioRoutingPermission=" + mHasModifyAudioRoutingPermission); pw.println(indent + "mRouterId=" + mRouterId); + + mDiscoveryPreference.dump(pw, indent); } }