Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b138496 authored by William Escande's avatar William Escande
Browse files

AndroidFrameworkEfficientStrings: append 

Resolve the following:
[AndroidFrameworkEfficientStrings] Call append() directly for each
argument instead of allocating a transparent StringBuilder

Bug: 344658662
Test: None
Flag: Exempt refactor
Change-Id: I8c89dcd18b862a4a4efe986f8de8603f3496035c
parent 15f1518c

android/app/src/com/android/bluetooth/a2dp/A2dpStackEvent.java

+4 −4
Original line number Diff line number Diff line
@@ -54,11 +54,11 @@ public class A2dpStackEvent { 
    public String toString() {

        // event dump

        StringBuilder result = new StringBuilder();

        result.append("A2dpStackEvent {type:" + eventTypeToString(type));

        result.append(", device:" + device);

        result.append(", value1:" + eventTypeValueIntToString(type, valueInt));

        result.append("A2dpStackEvent {type:").append(eventTypeToString(type));

        result.append(", device:").append(device);

        result.append(", value1:").append(eventTypeValueIntToString(type, valueInt));

        if (codecStatus != null) {

            result.append(", codecStatus:" + codecStatus);

            result.append(", codecStatus:").append(codecStatus);

        }

        result.append("}");

        return result.toString();

android/app/src/com/android/bluetooth/audio_util/BrowsedPlayerWrapper.java

+2 −2
Original line number Diff line number Diff line
@@ -499,10 +499,10 @@ class BrowsedPlayerWrapper { 
    @Override

    public String toString() {

        StringBuilder sb = new StringBuilder();

        sb.append("Browsable Package Name: " + mPackageName + "\n");

        sb.append("Browsable Package Name: ").append(mPackageName).append("\n");

        sb.append("   Cached Media ID's: ");

        for (String id : mCachedFolders.keySet()) {

            sb.append("\"" + id + "\", ");

            sb.append("\"").append(id).append("\", ");

        }

        sb.append("\n");

        return sb.toString();

android/app/src/com/android/bluetooth/audio_util/MediaPlayerList.java

+8 −4
Original line number Diff line number Diff line
@@ -1340,25 +1340,29 @@ public class MediaPlayerList { 


    /** Dumps all players and browsable players currently listed in this class. */

    public void dump(StringBuilder sb) {

        sb.append("List of MediaControllers: size=" + mMediaPlayers.size() + "\n");

        sb.append("List of MediaControllers: size=").append(mMediaPlayers.size()).append("\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("  Media Player ")

                    .append(id)

                    .append(": ")

                    .append(player.getPackageName())

                    .append("\n");

            sb.append(player.toString().replaceAll("(?m)^", "  "));

            sb.append("\n");

        }



        if (Flags.browsingRefactor()) {

            sb.append("List of Browsers: size=" + mMediaBrowserWrappers.size() + "\n");

            sb.append("List of Browsers: size=").append(mMediaBrowserWrappers.size()).append("\n");

            for (MediaBrowserWrapper player : mMediaBrowserWrappers.values()) {

                sb.append(player.toString().replaceAll("(?m)^", "  "));

                sb.append("\n");

            }

        } else {

            sb.append("List of Browsers: size=" + mBrowsablePlayers.size() + "\n");

            sb.append("List of Browsers: size=").append(mBrowsablePlayers.size()).append("\n");

            for (BrowsedPlayerWrapper player : mBrowsablePlayers.values()) {

                sb.append(player.toString().replaceAll("(?m)^", "  "));

                sb.append("\n");

android/app/src/com/android/bluetooth/audio_util/MediaPlayerWrapper.java

+5 −5
Original line number Diff line number Diff line
@@ -619,13 +619,13 @@ public class MediaPlayerWrapper { 
    @Override

    public String toString() {

        StringBuilder sb = new StringBuilder();

        sb.append(mMediaController.toString() + "\n");

        sb.append(mMediaController.toString()).append("\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");

        sb.append("  Song: ").append(mCurrentData.metadata).append("\n");

        sb.append("  PlayState: ").append(mCurrentData.state).append("\n");

        sb.append("  Queue: size=").append(mCurrentData.queue.size()).append("\n");

        for (Metadata data : mCurrentData.queue) {

            sb.append("    " + data + "\n");

            sb.append("    ").append(data).append("\n");

        }

        mPlaybackStateChangeEventLogger.dump(sb);

        return sb.toString();

android/app/src/com/android/bluetooth/avrcp/AvrcpCoverArtService.java

+2 −2
Original line number Diff line number Diff line
@@ -263,10 +263,10 @@ public class AvrcpCoverArtService { 
    public void dump(StringBuilder sb) {

        int psm = getL2capPsm();

        sb.append("AvrcpCoverArtService:");

        sb.append("\n\tpsm = " + (psm == 0 ? "null" : psm));

        sb.append("\n\tpsm = ").append((psm == 0 ? "null" : psm));

        mStorage.dump(sb);

        synchronized (mClientsLock) {

            sb.append("\n\tclients = " + Arrays.toString(mClients.keySet().toArray()));

            sb.append("\n\tclients = ").append(Arrays.toString(mClients.keySet().toArray()));

        }

        sb.append("\n");

    }