Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0cf789fc: am 2a964260: am fbdf212c: Merge "Changed flow in export methods to continue through the loop if it encounters an int[] return type." into lmp-dev

Browse Source 
* commit '0cf789fc2f081f79079700eee8eef648248f291e':
  Changed flow in export methods to continue through the loop if it encounters an int[] return type.
This commit is contained in:
Jon Miranda
2014-08-13 00:14:24 +00:00
committed by Android Git Automerger
parent 43b0913e7f 54ff3c7994
commit f49e836ed3
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/view/ViewDebug.java
View File

@@ -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 +