Merge "Prevent null point exception" am: 45b03edd00 am: bfa1f2979e (8f962122) · Commits · e / os / android_packages_apps_Settings

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}