Merge "Prevent null point exception"

am: 45b03edd00

Change-Id: Ifbcf83606e115cb1a759382b38949f49af4e4112
This commit is contained in:
Raff Tsai
2019-11-26 00:02:27 -08:00
committed by android-build-merger

View File

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