Camcorder default video quality preference updated as per UI.

Video quality preference was not initialized to the default value.
But it was read as null and set to maximum available quality. So
the actual value set to camera is different from the one user see
in the settings list.
This change will set the default quality to the preference if its
supported.

Change-Id: Ie219e0965a6ac06e62f32cc6c52fdf255a07adee
CRs-Fixed: 565374

1 files changed, 11 insertions, 4 deletions

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 057332b09..483d5c04c 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -712,10 +712,17 @@ public class VideoModule implements CameraModule,
                         null);
         if (videoQuality == null) {
              mParameters = mCameraDevice.getParameters();
-            // check for highest quality before setting default value
-            videoQuality = CameraSettings.getSupportedHighestVideoQuality(mCameraId,
-                    mActivity.getResources().getString(R.string.pref_video_quality_default),
-                                                       mParameters);
+            String defaultQuality = mActivity.getResources().getString(
+                    R.string.pref_video_quality_default);
+            boolean hasProfile = CamcorderProfile.hasProfile(
+                     Integer.parseInt(defaultQuality));
+            if (hasProfile == true){
+                videoQuality = defaultQuality;
+            } else {
+                // check for highest quality if default quality is not supported
+                videoQuality = CameraSettings.getSupportedHighestVideoQuality(mCameraId,
+                        defaultQuality, mParameters);
+            }
             mPreferences.edit().putString(CameraSettings.KEY_VIDEO_QUALITY, videoQuality);
         }
         int quality = Integer.valueOf(videoQuality);