From 48520210958b07d99791779abd52ba8034f3aa21 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Fri, 8 Aug 2014 10:49:47 -0700 Subject: [PATCH] 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 --- core/java/android/view/ViewDebug.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java index 0b15ba790201..4d9a8ccd9aad 100644 --- a/core/java/android/view/ViewDebug.java +++ b/core/java/android/view/ViewDebug.java @@ -1107,8 +1107,7 @@ private static void exportMethods(Context context, Object view, BufferedWriter o 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 @@ private static void exportFields(Context context, Object view, BufferedWriter ou 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 +