commit b808eb0464aa033d514d7d22c62acaf77415cfe9
author Sunny Shao <sunnyshao@google.com> Fri Nov 08 10:53:53 2019 +0800
committer Sunny Shao <sunnyshao@google.com> Fri Nov 08 10:53:53 2019 +0800
tree dce6780a674886261f68916a8a4d5ca0dedb40be
parent 38701ed7eae5ba71a710e039088d873575975c80

Fix the NPE in the AnimationController

Add the null checking in onBindViewHolder

Fixes: 144099781
Test: compilation
Change-Id: Iafb8f758d7d71ce9fa67f4ad94d5a8a417ad674a

src/com/android/settings/widget/VideoPreference.java

diff --git a/src/com/android/settings/widget/VideoPreference.java b/src/com/android/settings/widget/VideoPreference.java
index 006c13a..949ba9b 100644
--- a/src/com/android/settings/widget/VideoPreference.java
+++ b/src/com/android/settings/widget/VideoPreference.java
@@ -123,7 +123,9 @@
             layout.setLayoutParams(new LinearLayout.LayoutParams(
                     LinearLayout.LayoutParams.MATCH_PARENT, mHeight));
         }
-        mAnimationController.attachView(mVideo, mPreviewImage, mPlayButton);
+        if (mAnimationController != null) {
+            mAnimationController.attachView(mVideo, mPreviewImage, mPlayButton);
+        }
     }
 
     @Override