Merge "Prevent null point exception" am: 45b03edd00

am: bfa1f2979e

Change-Id: Ib0afc6d71113b52fc63caf5b960ca7239a5c364c
This commit is contained in:
Raff Tsai
2019-11-26 00:04:15 -08:00
committed by android-build-merger

View File

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