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

am 631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value"

Browse Source 
* commit '631565abd6cadd65befe197afa7bac0d44f70fb2':
  Change getDeclaredFieldsUnchecked call to new return value
This commit is contained in:
Mathieu Chartier
2015-03-29 22:42:53 +00:00
committed by Android Git Automerger
parent d7fb6d26d8 631565abd6
commit d9dddea504
1 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1005,30 +1005,22 @@ public class ViewDebug {
return fields; 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 { try {
field.getType(); final Field[] declaredFields = klass.getDeclaredFieldsUnchecked(false);
} catch (NoClassDefFoundError e) { final ArrayList<Field> foundFields = new ArrayList<Field>();
continue; for (final Field field : declaredFields) {
} // Fields which can't be resolved have a null type.
if (field.getType() != null && field.isAnnotationPresent(ExportedProperty.class)) {
if (field.isAnnotationPresent(ExportedProperty.class)) {
field.setAccessible(true); field.setAccessible(true);
foundFields.add(field); foundFields.add(field);
sAnnotations.put(field, field.getAnnotation(ExportedProperty.class)); sAnnotations.put(field, field.getAnnotation(ExportedProperty.class));
} }
} }
fields = foundFields.toArray(new Field[foundFields.size()]); fields = foundFields.toArray(new Field[foundFields.size()]);
map.put(klass, fields); map.put(klass, fields);
} catch (NoClassDefFoundError e) {
throw new AssertionError(e);
}
return fields; return fields;
} }