Merge "Fix the NPE in the AnimationController"

2019-11-08 05:46:37 +00:00
parent 504d2d3cba b808eb0464
commit 7aa1aa4c5f
1 changed files with 3 additions and 1 deletions
--- a/src/com/android/settings/widget/VideoPreference.java
+++ b/src/com/android/settings/widget/VideoPreference.java
@@ -123,7 +123,9 @@ public class VideoPreference extends Preference {
            layout.setLayoutParams(new LinearLayout.LayoutParams(
                    LinearLayout.LayoutParams.MATCH_PARENT, mHeight));
        }
-        mAnimationController.attachView(mVideo, mPreviewImage, mPlayButton);
+        if (mAnimationController != null) {
+            mAnimationController.attachView(mVideo, mPreviewImage, mPlayButton);
+        }
    }

    @Override