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

Merge "Change getDeclaredFieldsUnchecked call to new return value"

Browse Source
This commit is contained in:
Mathieu Chartier
2015-03-29 22:30:41 +00:00
committed by Gerrit Code Review
parent a01250c774 3d529c5b0a
commit 631565abd6
1 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1005,31 +1005,23 @@ public class ViewDebug {
return fields;
}
final ArrayList<Field> declaredFields = new ArrayList();
klass.getDeclaredFieldsUnchecked(false, declaredFields);
final ArrayList<Field> foundFields = new ArrayList<Field>();
final int count = declaredFields.size();
for (int i = 0; i < count; i++) {
final Field field = declaredFields.get(i);
// Ensure the field type can be resolved.
try {
field.getType();
} catch (NoClassDefFoundError e) {
continue;
}
if (field.isAnnotationPresent(ExportedProperty.class)) {
field.setAccessible(true);
foundFields.add(field);
sAnnotations.put(field, field.getAnnotation(ExportedProperty.class));
try {
final Field[] declaredFields = klass.getDeclaredFieldsUnchecked(false);
final ArrayList<Field> foundFields = new ArrayList<Field>();
for (final Field field : declaredFields) {
// Fields which can't be resolved have a null type.
if (field.getType() != null && field.isAnnotationPresent(ExportedProperty.class)) {
field.setAccessible(true);
foundFields.add(field);
sAnnotations.put(field, field.getAnnotation(ExportedProperty.class));
}
}
fields = foundFields.toArray(new Field[foundFields.size()]);
map.put(klass, fields);
} catch (NoClassDefFoundError e) {
throw new AssertionError(e);
}
fields = foundFields.toArray(new Field[foundFields.size()]);
map.put(klass, fields);
return fields;
}
@@ -1651,4 +1643,4 @@ public class ViewDebug {
}
});
}
}
}