diff options
| -rw-r--r-- | core/java/android/animation/PropertyValuesHolder.java | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/core/java/android/animation/PropertyValuesHolder.java b/core/java/android/animation/PropertyValuesHolder.java index 8928e99cecd2..e993cca9e325 100644 --- a/core/java/android/animation/PropertyValuesHolder.java +++ b/core/java/android/animation/PropertyValuesHolder.java @@ -861,22 +861,23 @@ public class PropertyValuesHolder implements Cloneable { if (mProperty != null) { Object value = convertBack(mProperty.get(target)); kf.setValue(value); - } - try { - if (mGetter == null) { - Class targetClass = target.getClass(); - setupGetter(targetClass); + } else { + try { if (mGetter == null) { - // Already logged the error - just return to avoid NPE - return; + Class targetClass = target.getClass(); + setupGetter(targetClass); + if (mGetter == null) { + // Already logged the error - just return to avoid NPE + return; + } } + Object value = convertBack(mGetter.invoke(target)); + kf.setValue(value); + } catch (InvocationTargetException e) { + Log.e("PropertyValuesHolder", e.toString()); + } catch (IllegalAccessException e) { + Log.e("PropertyValuesHolder", e.toString()); } - Object value = convertBack(mGetter.invoke(target)); - kf.setValue(value); - } catch (InvocationTargetException e) { - Log.e("PropertyValuesHolder", e.toString()); - } catch (IllegalAccessException e) { - Log.e("PropertyValuesHolder", e.toString()); } } |