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

Commit 15f1518c authored by William Escande's avatar William Escande
Browse files

AndroidFrameworkEfficientStrings: StringBuilder 

Resolve the following:
[AndroidFrameworkEfficientStrings] Strongly encouraged to replace with
StringBuilder which avoids transparent StringBuilder allocations
[AndroidFrameworkEfficientStrings] Strongly encouraged to replace with
StringBuilder which avoids synchronization overhead

Bug: 344658662
Test: None
Flag: Exempt refactor
Change-Id: Ia91447d10668b9f8b27fa050a588162be4212f94
parent 078bdb4c

android/app/src/com/android/bluetooth/Utils.java

+7 −7
Original line number Diff line number Diff line
@@ -1204,20 +1204,20 @@ public final class Utils { 
     * @return String value representing CCC state

     */

    public static String cccIntToStr(Short cccValue) {

        String string = "";



        if (cccValue == 0) {

            return string += "NO SUBSCRIPTION";

            return "NO SUBSCRIPTION";

        }



        if (BigInteger.valueOf(cccValue).testBit(0) && BigInteger.valueOf(cccValue).testBit(1)) {

            return "NOTIFICATION|INDICATION";

        }

        if (BigInteger.valueOf(cccValue).testBit(0)) {

            string += "NOTIFICATION";

            return "NOTIFICATION";

        }

        if (BigInteger.valueOf(cccValue).testBit(1)) {

            string += string.isEmpty() ? "INDICATION" : "|INDICATION";

            return "INDICATION";

        }



        return string;

        return "";

    }



    /**

android/app/src/com/android/bluetooth/a2dpsink/StackEvent.java

+10 −11
Original line number Diff line number Diff line
@@ -47,27 +47,26 @@ final class StackEvent { 


    @Override

    public String toString() {

        String s = "StackEvent<device=" + mDevice + ", type =";

        StringBuilder sb = new StringBuilder("StackEvent<device=" + mDevice + ", type =");

        switch (mType) {

            case EVENT_TYPE_CONNECTION_STATE_CHANGED:

                s += "EVENT_TYPE_CONNECTION_STATE_CHANGED, state=" + mState;

                sb.append("EVENT_TYPE_CONNECTION_STATE_CHANGED, state=").append(mState);

                break;

            case EVENT_TYPE_AUDIO_STATE_CHANGED:

                s += "EVENT_TYPE_AUDIO_STATE_CHANGED, state=" + mState;

                sb.append("EVENT_TYPE_AUDIO_STATE_CHANGED, state=").append(mState);

                break;

            case EVENT_TYPE_AUDIO_CONFIG_CHANGED:

                s +=

                        "EVENT_TYPE_AUDIO_CONFIG_CHANGED, sampleRate="

                                + mSampleRate

                                + ", channelCount="

                                + mChannelCount;

                sb.append("EVENT_TYPE_AUDIO_CONFIG_CHANGED, sampleRate=")

                        .append(mSampleRate)

                        .append(", channelCount=")

                        .append(mChannelCount);

                break;

            default:

                s += "Unknown";

                sb.append("Unknown");

                break;

        }

        s += ">";

        return s;

        sb.append(">");

        return sb.toString();

    }



    static StackEvent connectionStateChanged(BluetoothDevice device, int state) {

android/app/src/com/android/bluetooth/avrcp/helpers/CoverArt.java

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public class CoverArt { 
            digest.update(/* Bitmap to input stream */ image);

            byte[] messageDigest = digest.digest();



            StringBuffer hexString = new StringBuffer();

            StringBuilder hexString = new StringBuilder();

            for (int i = 0; i < messageDigest.length; i++) {

                hexString.append(Integer.toHexString(0xFF & messageDigest[i]));

            }

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpCoverArtManager.java

+12 −8
Original line number Diff line number Diff line
@@ -479,20 +479,24 @@ public class AvrcpCoverArtManager { 


    @Override

    public String toString() {

        String s = "CoverArtManager:\n";

        s += "    Download Scheme: " + mDownloadScheme + "\n";

        StringBuilder sb = new StringBuilder("CoverArtManager:\n");

        sb.append("    Download Scheme: ").append(mDownloadScheme).append("\n");

        for (BluetoothDevice device : mClients.keySet()) {

            AvrcpBipClient client = getClient(device);

            AvrcpBipSession session = getSession(device);

            s += "    " + device + ":" + "\n";

            s += "      Client: " + client.toString() + "\n";

            s += "      Handles: " + "\n";

            sb.append("    ").append(device).append(":").append("\n");

            sb.append("      Client: ").append(client.toString()).append("\n");

            sb.append("      Handles: ").append("\n");

            for (String handle : session.getSessionHandles()) {

                s += "        " + handle + " -> " + session.getHandleUuid(handle) + "\n";

                sb.append("        ")

                        .append(handle)

                        .append(" -> ")

                        .append(session.getHandleUuid(handle))

                        .append("\n");

            }

        }

        s += "  " + mCoverArtStorage.toString();

        return s;

        sb.append("  ").append(mCoverArtStorage.toString());

        return sb.toString();

    }



    /** Print to debug if debug is enabled for this class */

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpCoverArtStorage.java

+5 −5
Original line number Diff line number Diff line
@@ -145,16 +145,16 @@ public class AvrcpCoverArtStorage { 


    @Override

    public String toString() {

        String s = "CoverArtStorage:\n";

        StringBuilder sb = new StringBuilder("CoverArtStorage:\n");

        for (BluetoothDevice device : mDeviceImages.keySet()) {

            Map<String, Bitmap> images = mDeviceImages.get(device);

            s += "  " + device + " (" + images.size() + "):";

            sb.append("  ").append(device).append(" (").append(images.size()).append("):");

            for (String uuid : images.keySet()) {

                s += "\n    " + uuid;

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

            }

            s += "\n";

            sb.append("\n");

        }

        return s;

        return sb.toString();

    }



    private void debug(String msg) {