Merge "SnapdragonCamera: Set highest supported video resolution by default."

2 files changed, 6 insertions, 17 deletions

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 63581b8ba..c057ee01f 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -289,15 +289,12 @@ public class CameraSettings {
         return group;
     }
 
-    public static String getSupportedHighestVideoQuality(int cameraId,
-            String defaultQuality,Parameters parameters) {
+    public static String getSupportedHighestVideoQuality(
+            int cameraId, Parameters parameters) {
         // When launching the camera app first time, we will set the video quality
         // to the first one (i.e. highest quality) in the supported list
         List<String> supported = getSupportedVideoQualities(cameraId,parameters);
-        if (supported == null) {
-            Log.e(TAG, "No supported video quality is found");
-            return defaultQuality;
-        }
+        assert (supported != null) : "No supported video quality is found";
         return supported.get(0);
     }
 
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 84273dbda..6e3198390 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -780,17 +780,9 @@ public class VideoModule implements CameraModule,
                         null);
         if (videoQuality == null) {
             mParameters = mCameraDevice.getParameters();
-            String defaultQuality = mActivity.getResources().getString(
-                    R.string.pref_video_quality_default);
-            boolean hasProfile = CamcorderProfile.hasProfile(
-                     CameraSettings.VIDEO_QUALITY_TABLE.get(defaultQuality));
-            if (hasProfile == true){
-                videoQuality = defaultQuality;
-            } else {
-                // check for highest quality if default quality is not supported
-                videoQuality = CameraSettings.getSupportedHighestVideoQuality(mCameraId,
-                        defaultQuality, mParameters);
-            }
+            // check for highest quality supported
+            videoQuality = CameraSettings.getSupportedHighestVideoQuality(
+                    mCameraId, mParameters);
             mPreferences.edit().putString(CameraSettings.KEY_VIDEO_QUALITY, videoQuality);
         }
         int quality = CameraSettings.VIDEO_QUALITY_TABLE.get(videoQuality);