summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@cyanogenmod.org>2016-01-09 04:33:43 +0200
committerMichael Bestas <mikeioannina@cyanogenmod.org>2016-01-09 20:50:16 +0200
commit6bfdb1bffac4d2e56c7c7a1522f3cc966daff072 (patch)
tree983b1b14371617d4c4e3f44136a5a8ed29b02771 /src/com/android/camera/CameraSettings.java
parentb0d6486f53d1d41d168d217d58ce3a81bdc34537 (diff)
downloadandroid_packages_apps_Snap-6bfdb1bffac4d2e56c7c7a1522f3cc966daff072.tar.gz
android_packages_apps_Snap-6bfdb1bffac4d2e56c7c7a1522f3cc966daff072.tar.bz2
android_packages_apps_Snap-6bfdb1bffac4d2e56c7c7a1522f3cc966daff072.zip
Snap: Remove dead code
* Remove non-standard video resolutions. * Revert "camera: override shutter sound volume" commit 8a50cda8f72738e943904fdf7cae189b2b0a8ea8. Adapted from CodeAurora commit 000c6fa3b5c95297496e0ae077030132409871ea Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r--src/com/android/camera/CameraSettings.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 2567e89c0..4d8a13aeb 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -1305,13 +1305,11 @@ public class CameraSettings {
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
private static void getFineResolutionQuality(ArrayList<String> supported,
int cameraId,Parameters parameters) {
-
if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_4KDCI)) {
if (checkSupportedVideoQuality(parameters,4096,2160)) {
supported.add(Integer.toString(CamcorderProfile.QUALITY_4KDCI));
}
}
-
if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_2160P)) {
if (checkSupportedVideoQuality(parameters,3840,2160)) {
supported.add(Integer.toString(CamcorderProfile.QUALITY_2160P));