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

Commit e2e2db84 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "RILUtils convertToString use AIDL toString if available" am: 25623965 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2048051



Change-Id: I933e5d72a380efb2223e5959686f88af5c47e5f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7996fd1f 25623965

src/java/com/android/internal/telephony/RILUtils.java

+9 −1
Original line number Diff line number Diff line
@@ -5170,7 +5170,15 @@ public class RILUtils { 
     * @return A string containing all public non-static local variables of a class

     */

    public static String convertToString(Object o) {

        if (isPrimitiveOrWrapper(o.getClass()) || o.getClass() == String.class) return o.toString();

        boolean toStringExists = false;

        try {

            toStringExists = o.getClass().getMethod("toString").getDeclaringClass() != Object.class;

        } catch (NoSuchMethodException e) {

            loge(e.toString());

        }

        if (toStringExists || isPrimitiveOrWrapper(o.getClass()) || o instanceof ArrayList) {

            return o.toString();

        }

        if (o.getClass().isArray()) {

            // Special handling for arrays

            StringBuilder sb = new StringBuilder("[");