diff options
| author | Chris Craik <ccraik@google.com> | 2017-01-09 18:15:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-09 18:15:32 +0000 |
| commit | 22944585650ba2113bea67f775c6467b0bb50169 (patch) | |
| tree | 3d7cc5b3484057567c1532d0f9ce13afe92af4f5 /core/java/android | |
| parent | 9f7b7ce0c8119bd16ddc4571600b5ca25879da48 (diff) | |
| parent | 686d972e1294eecaeb15db37a34c521cba0ac5a0 (diff) | |
Merge "Fix NPE in RenderNodeAnimator ALPHA when used outside ViewPropertyAnimator"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/RenderNodeAnimator.java | 3 | ||||
| -rw-r--r-- | core/java/android/view/View.java | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/view/RenderNodeAnimator.java b/core/java/android/view/RenderNodeAnimator.java index 7747580892f1..95150409514d 100644 --- a/core/java/android/view/RenderNodeAnimator.java +++ b/core/java/android/view/RenderNodeAnimator.java @@ -200,8 +200,7 @@ public class RenderNodeAnimator extends Animator { // in mTransformationInfo instead of in RenderNode, so we need to update // it with the final value here. if (mRenderProperty == RenderNodeAnimator.ALPHA) { - // Don't need null check because ViewPropertyAnimator's - // ctor calls ensureTransformationInfo() + mViewTarget.ensureTransformationInfo(); mViewTarget.mTransformationInfo.mAlpha = mFinalValue; } diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index aa941b8fcfb4..aad7e0a12398 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -3394,7 +3394,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, float mTransitionAlpha = 1f; } - TransformationInfo mTransformationInfo; + /** @hide */ + public TransformationInfo mTransformationInfo; /** * Current clip bounds. to which all drawing of this view are constrained. |