Merge "Cleanup and improve AVRCP logging" (dddfc485) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/newavrcp/BrowsedPlayerWrapper.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -315,12 +315,15 @@ class BrowsedPlayerWrapper {
		}
		}

		public void dump(StringBuilder sb) {
		@Override
		public String toString() {
		StringBuilder sb = new StringBuilder();
		sb.append("Browsable Package Name: " + mPackageName + "\n");
		sb.append(" Cached Media ID's: ");
		for (String id : mCachedFolders.keySet()) {
		sb.append(id + " ");
		sb.append("\"" + id + "\", ");
		}
		sb.append("\n\n");
		sb.append("\n");
		return sb.toString();
		}
		}

+12 −14

Original line number	Diff line number	Diff line
		@@ -634,24 +634,22 @@ public class MediaPlayerList {


		void dump(StringBuilder sb) {
		sb.append("List of players:\n");
		for (String key : mMediaPlayerIds.keySet()) {
		if (mMediaPlayerIds.get(key) == mActivePlayerId) {
		sb.append("*");
		}
		sb.append("Player " + mMediaPlayerIds.get(key) + ": " + key + "\n");
		}
		sb.append("List of MediaControllers: size=" + mMediaPlayers.size() + "\n");
		for (int id : mMediaPlayers.keySet()) {
		if (id == mActivePlayerId) {
		sb.append("<Active> ");
		}
		MediaPlayerWrapper player = mMediaPlayers.get(id);
		sb.append(" Media Player " + id + ": " + player.getPackageName() + "\n");
		sb.append(player.toString().replaceAll("(?m)^", " "));
		sb.append("\n");
		sb.append("List of media controllers size: " + mMediaPlayers.size() + "\n");
		for (MediaPlayerWrapper player: mMediaPlayers.values()) {
		player.dump(sb);
		}
		sb.append("\n");
		sb.append("Browsable Player list size: " + mBrowsablePlayers.size() + "\n");

		sb.append("List of Browsers: size=" + mBrowsablePlayers.size() + "\n");
		for (BrowsedPlayerWrapper player : mBrowsablePlayers.values()) {
		player.dump(sb);
		sb.append(player.toString().replaceAll("(?m)^", " "));
		sb.append("\n");
		}

		// TODO (apanicke): Add media key events
		// TODO (apanicke): Add last sent data
		// TODO (apanicke): Add addressed player history

+11 −1

Original line number	Diff line number	Diff line
		@@ -492,7 +492,17 @@ class MediaPlayerWrapper {
		return mControllerCallbacks.getTimeoutHandler();
		}

		public void dump(StringBuilder sb) {
		@Override
		public String toString() {
		StringBuilder sb = new StringBuilder();
		sb.append(mMediaController.toString() + "\n");
		sb.append("Current Data:\n");
		sb.append(" Song: " + mCurrentData.metadata + "\n");
		sb.append(" PlayState: " + mCurrentData.state + "\n");
		sb.append(" Queue: size=" + mCurrentData.queue.size() + "\n");
		for (Metadata data : mCurrentData.queue) {
		sb.append(" " + data + "\n");
		}
		return sb.toString();
		}
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -53,4 +53,10 @@ class Metadata implements Cloneable {
		if (!Objects.equals(album, m.album)) return false;
		return true;
		}

		@Override
		public String toString() {
		return "{ mediaId=\"" + mediaId + "\" title=\"" + title + "\" artist=\"" + artist
		+ "\" album=\"" + album + "\" }";
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -74,4 +74,9 @@ class PlayStatus {
		return PlayStatus.ERROR;
		}
		}

		@Override
		public String toString() {
		return "{ state=" + state + " position=" + position + " duration=" + duration + " }";
		}
		}