Restrict effects to 480p.

- Preview stretching still occurs after some transitions.
- Correct quality used in recording, shown in UI at all times.

Bug: 5320425
Change-Id: I63612c55d2e6e0e979208c59f2caf9a61ac1d3f8

1 files changed, 11 insertions, 3 deletions

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index eb0161a..a974402 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -82,9 +82,17 @@ public class CameraSettings {
         return group;
     }
 
-    public String getDefaultVideoQuality(String defaultQuality) {
-        int quality = Integer.valueOf(defaultQuality);
-        if (CamcorderProfile.hasProfile(mCameraId, quality)) {
+    public static String getDefaultVideoQuality(int cameraId,
+            String defaultQuality) {
+        int quality = -1;
+        try {
+            quality = Integer.valueOf(defaultQuality);
+        } catch(NumberFormatException e) {
+            Log.e(TAG, "Cannot convert default quality setting '"
+                    + defaultQuality
+                    + "' into CamcorderProfile quality. Using fallback");
+        }
+        if (CamcorderProfile.hasProfile(cameraId, quality)) {
             return defaultQuality;
         }
         return Integer.toString(CamcorderProfile.QUALITY_HIGH);