diff options
| author | Jon Miranda <jonmiranda@google.com> | 2014-08-12 23:58:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-12 23:14:35 +0000 |
| commit | 177f08e593a9a1a4b37ab8b92c55f7178c42c78a (patch) | |
| tree | b66d2faf396b5f8e75a8d03fd3f5e2a3d7e85ce0 | |
| parent | 2adf8902ce39f066d001cb7171d93066162fb486 (diff) | |
| parent | 48520210958b07d99791779abd52ba8034f3aa21 (diff) | |
| download | frameworks_base-177f08e593a9a1a4b37ab8b92c55f7178c42c78a.zip frameworks_base-177f08e593a9a1a4b37ab8b92c55f7178c42c78a.tar.gz frameworks_base-177f08e593a9a1a4b37ab8b92c55f7178c42c78a.tar.bz2 | |
Merge "Changed flow in export methods to continue through the loop if it encounters an int[] return type." into lmp-dev
| -rw-r--r-- | core/java/android/view/ViewDebug.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java index 0b15ba7..4d9a8cc 100644 --- a/core/java/android/view/ViewDebug.java +++ b/core/java/android/view/ViewDebug.java @@ -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 + |