diff options
| author | Alan Newberger <alann@google.com> | 2015-06-19 13:59:32 -0700 |
|---|---|---|
| committer | Alan Newberger <alann@google.com> | 2015-06-19 13:59:32 -0700 |
| commit | d3611d6a86f46fb877e5260410ddd6389445be1e (patch) | |
| tree | d1c16855e8e0646d9a90f1122455cb9a6b2ff23d /src | |
| parent | e07a7e90a11a60e073ef55d3633671ca29177e6c (diff) | |
| download | android_packages_apps_Camera2-d3611d6a86f46fb877e5260410ddd6389445be1e.tar.gz android_packages_apps_Camera2-d3611d6a86f46fb877e5260410ddd6389445be1e.tar.bz2 android_packages_apps_Camera2-d3611d6a86f46fb877e5260410ddd6389445be1e.zip | |
AOSP Camera source should run camera2 API on M
In all cases has Camera2 app run in CaptureModule, using
capability levels to configure in either LEGACY or LIMITED
JPEG, or full ZSL mode.
BUG=21490086
Change-Id: I75842e9afc8d6ef387dd6611a5251394e8318caa
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java b/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java index 8d0b387fb..0cedb183e 100644 --- a/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java +++ b/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java @@ -40,10 +40,8 @@ public class OneCameraFeatureConfigCreator { */ public static OneCameraFeatureConfig createDefault(ContentResolver contentResolver, MemoryManager memoryManager) { - // Enable CaptureModule on all L devices unless the device is - // black-listed. - boolean useCaptureModule = ApiHelper.HAS_CAMERA_2_API - && !GservicesHelper.isCaptureModuleDisabled(contentResolver); + // Enable CaptureModule on all M devices. + boolean useCaptureModule = true; Log.i(TAG, "CaptureModule? " + useCaptureModule); // HDR+ has multiple levels of support. |