diff options
| author | Jason Noguchi <jnoguchi@google.com> | 2013-04-11 17:39:20 -0700 |
|---|---|---|
| committer | Jason Noguchi <jnoguchi@google.com> | 2013-04-11 18:08:18 -0700 |
| commit | 4205d50cbb7fcf822e992c955719d4f8872f37d5 (patch) | |
| tree | 6832cb3654c0a5a9dc75c54403c394703a614769 | |
| parent | 7c6140adb4ea219da3a45f5d69daae3f4340593a (diff) | |
| download | android_packages_apps_Snap-4205d50cbb7fcf822e992c955719d4f8872f37d5.tar.gz android_packages_apps_Snap-4205d50cbb7fcf822e992c955719d4f8872f37d5.tar.bz2 android_packages_apps_Snap-4205d50cbb7fcf822e992c955719d4f8872f37d5.zip | |
Add checks for NPE in video pie menu.
Bug: 8536361
Change-Id: Iabd818e4e9fadf1f36ffed894ca7248f9568e6c9
| -rw-r--r-- | src/com/android/camera/VideoMenu.java | 53 |
1 files changed, 31 insertions, 22 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index c9f293222..ea70ddcdd 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -59,30 +59,39 @@ public class VideoMenu extends PieController super.initialize(group); mPopup = null; mPopupStatus = POPUP_NONE; - - PieItem item = makeItem(CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, POS_FLASH, 5); - mRenderer.addItem(item); - item = makeItem(CameraSettings.KEY_WHITE_BALANCE, POS_WB, 5); - mRenderer.addItem(item); + PieItem item = null; + // flash + if (group.findPreference(CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE) != null) { + item = makeItem(CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, POS_FLASH, 5); + mRenderer.addItem(item); + } + // white balance + if (group.findPreference(CameraSettings.KEY_WHITE_BALANCE) != null) { + item = makeItem(CameraSettings.KEY_WHITE_BALANCE, POS_WB, 5); + mRenderer.addItem(item); + } // camera switcher - item = makeItem(R.drawable.ic_switch_video_facing_holo_light); - item.setPosition(POS_SWITCH, 5); - item.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(PieItem item) { - // Find the index of next camera. - ListPreference pref = mPreferenceGroup.findPreference(CameraSettings.KEY_CAMERA_ID); - if (pref != null) { - int index = pref.findIndexOfValue(pref.getValue()); - CharSequence[] values = pref.getEntryValues(); - index = (index + 1) % values.length; - int newCameraId = Integer.parseInt((String) values[index]); - mListener.onCameraPickerClicked(newCameraId); + if (group.findPreference(CameraSettings.KEY_CAMERA_ID) != null) { + item = makeItem(R.drawable.ic_switch_video_facing_holo_light); + item.setPosition(POS_SWITCH, 5); + item.setOnClickListener(new OnClickListener() { + + @Override + public void onClick(PieItem item) { + // Find the index of next camera. + ListPreference pref = + mPreferenceGroup.findPreference(CameraSettings.KEY_CAMERA_ID); + if (pref != null) { + int index = pref.findIndexOfValue(pref.getValue()); + CharSequence[] values = pref.getEntryValues(); + index = (index + 1) % values.length; + int newCameraId = Integer.parseInt((String) values[index]); + mListener.onCameraPickerClicked(newCameraId); + } } - } - }); - mRenderer.addItem(item); + }); + mRenderer.addItem(item); + } // settings popup mOtherKeys = new String[] { CameraSettings.KEY_VIDEO_EFFECT, |