| commit | 8f962122a78933f5eb3e9308e28bec8ac379102b | [log] [tgz] |
|---|---|---|
| author | Raff Tsai <rafftsai@google.com> | Tue Nov 26 00:07:40 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 26 00:07:40 2019 -0800 |
| tree | 76fc26ee1999fb92c28baebd53c79db88f5bb4d9 | |
| parent | 15909104901d8689ae19b042f064be8ce04c0d38 [diff] | |
| parent | 14990a19015ebff77429161e75afd9ee5fc25127 [diff] |
Merge "Prevent null point exception" am: 45b03edd00 am: bfa1f2979e am: 14990a1901 Change-Id: I5ef5583fb0c1a0943941a378d4421bedec703371
diff --git a/src/com/android/settings/widget/VideoPreferenceController.java b/src/com/android/settings/widget/VideoPreferenceController.java index 5f30fe4..4d7fc40 100644 --- a/src/com/android/settings/widget/VideoPreferenceController.java +++ b/src/com/android/settings/widget/VideoPreferenceController.java
@@ -36,7 +36,7 @@ @Override public int getAvailabilityStatus() { - return mVideoPreference.isAnimationAvailable() ? + return mVideoPreference != null && mVideoPreference.isAnimationAvailable() ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE; }