summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r--src/com/android/camera/CameraSettings.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 2ae2353af..19d0fda56 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -30,6 +30,7 @@ import android.util.Log;
import com.android.camera.util.ApiHelper;
import com.android.camera.util.CameraUtil;
+import com.android.camera.util.GcamHelper;
import com.android.camera2.R;
import java.util.ArrayList;
@@ -215,8 +216,8 @@ public class CameraSettings {
if (videoEffect != null) {
filterUnsupportedOptions(group, videoEffect, null);
}
- if (cameraHdr != null && (!ApiHelper.HAS_CAMERA_HDR
- || !CameraUtil.isCameraHdrSupported(mParameters))) {
+ if (cameraHdr != null && !GcamHelper.hasGcamAsHDRMode()
+ && (!ApiHelper.HAS_CAMERA_HDR || !CameraUtil.isCameraHdrSupported(mParameters))) {
removePreference(group, cameraHdr.getKey());
}
}