1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 7bf637dae..517046574 100755
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -328,10 +328,12 @@ public class SettingsManager implements ListMenu.SettingsListener {
     }
 
     public void updateQcfaPictureSize() {
-            ListPreference pictureSize = mPreferenceGroup.findPreference(KEY_PICTURE_SIZE);
+        ListPreference pictureSize = mPreferenceGroup.findPreference(KEY_PICTURE_SIZE);
+        if (pictureSize != null) {
             CameraSettings.formatPictureSizes(pictureSize,
                     getSupportedPictureSizeList(getCurrentCameraId()), mContext);
             CameraSettings.resetIfInvalid(pictureSize);
+        }
     }
 
     public void init() {