Merge "Fix potential NPE when looking up view tags for animating" into udc-dev am: a57a7086eb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23716020

Change-Id: Ib8b7725144329a736dbab1d8e902bd038ed6c949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mady Mellor
2023-06-16 19:13:34 +00:00
committed by Automerger Merge Worker

View File

@@ -523,6 +523,7 @@ public class PhysicsAnimationLayout extends FrameLayout {
*/
@Nullable private SpringAnimation getSpringAnimationFromView(
DynamicAnimation.ViewProperty property, View view) {
if (view == null) return null;
return (SpringAnimation) view.getTag(getTagIdForProperty(property));
}
@@ -531,11 +532,13 @@ public class PhysicsAnimationLayout extends FrameLayout {
* system.
*/
@Nullable private ViewPropertyAnimator getViewPropertyAnimatorFromView(View view) {
if (view == null) return null;
return (ViewPropertyAnimator) view.getTag(R.id.reorder_animator_tag);
}
/** Retrieves the target animator from the view via the view tag system. */
@Nullable private ObjectAnimator getTargetAnimatorFromView(View view) {
if (view == null) return null;
return (ObjectAnimator) view.getTag(R.id.target_animator_tag);
}