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

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

Browse Source 
* commit 'd9dddea504d717120eaa5e9c15fe484e26511e92':
  Change getDeclaredFieldsUnchecked call to new return value
This commit is contained in:
Mathieu Chartier
2015-03-30 00:26:46 +00:00
committed by Android Git Automerger
parent 3fa46a0f79 d9dddea504
commit 2169c68aa3
1 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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