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

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

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

Change-Id: I67c44156dc8bba895dea83ca3ca4b1d4fafb241a
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:32 +00:00
committed by Automerger Merge Worker
parent 463583aa40 a57a7086eb
commit 08ec8c06c9
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/PhysicsAnimationLayout.java
View File

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