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

Commit 177f08e5 authored by Jon Miranda's avatar Jon Miranda Committed by Android (Google) Code Review
Browse files

Merge "Changed flow in export methods to continue through the loop if it... 

Merge "Changed flow in export methods to continue through the loop if it encounters an int[] return type." into lmp-dev
parents 2adf8902 48520210

core/java/android/view/ViewDebug.java

+2 −4
Original line number Diff line number Diff line
@@ -1107,8 +1107,7 @@ public class ViewDebug { 


                    exportUnrolledArray(context, out, property, array, valuePrefix, suffix);



                    // Probably want to return here, same as for fields.

                    return;

                    continue;

                } else if (!returnType.isPrimitive()) {

                    if (property.deepExport()) {

                        dumpViewProperties(context, methodValue, out, prefix + property.prefix());
@@ -1187,8 +1186,7 @@ public class ViewDebug { 


                    exportUnrolledArray(context, out, property, array, valuePrefix, suffix);



                    // We exit here!

                    return;

                    continue;

                } else if (!type.isPrimitive()) {

                    if (property.deepExport()) {

                        dumpViewProperties(context, field.get(view), out, prefix +