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

Commit 48520210 authored by Jon Miranda's avatar Jon Miranda
Browse files

Changed flow in export methods to continue through the loop if it encounters 

an int[] return type.

There are two such instances:

1. "private int[] mRules" within RelativeLayout LayoutParams.
2. "public int[] getLocationOnScreen" in View.

When I added #2, we noticed missing annotated fields/methods in Hierarchy
Viewer, but #1 also caused the same issue (mainly not exporting
alignWithParent field)

Bug: 16844914
Change-Id: I0d83a4391aa0565897cd7f0523995c97b7a4976d
parent 125cf62d

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 +