Merge "Prevent null point exception" am: 45b03edd00 am: bfa1f2979e

am: 14990a1901

Change-Id: I5ef5583fb0c1a0943941a378d4421bedec703371

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

@@ -36,7 +36,7 @@ public class VideoPreferenceController extends BasePreferenceController implemen
 
     @Override
     public int getAvailabilityStatus() {
-        return mVideoPreference.isAnimationAvailable() ?
+        return mVideoPreference != null && mVideoPreference.isAnimationAvailable() ?
                 AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
     }