Commit 45591145 authored Oct 18, 2013 by Chirayu Desai Committed by Steve Kondik Oct 18, 2013

camera: VideoModule: fix NPE while trying to set HFR video parameter

* getSupportedVideoHighFrameRateModes can return null on a device
  which doesn't support it, so check if it's not null rather than
  checking if it's size is > 0.

Change-Id: Ie5be1f8a0f885ea913be5fb1eb44a97e648756d6

parent 505a85fa

src/com/android/camera/VideoModule.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2099,7 +2099,7 @@ public class VideoModule implements CameraModule,

		// Enable HFR mode for WVGA
		List<String> hfrModes = mParameters.getSupportedVideoHighFrameRateModes();
		if (hfrModes.size() > 0) {
		if (hfrModes != null) {
		mParameters.setVideoHighFrameRate(mEnableHFR ? hfrModes.get(hfrModes.size() - 1) : "off");
		}