From d3611d6a86f46fb877e5260410ddd6389445be1e Mon Sep 17 00:00:00 2001 From: Alan Newberger Date: Fri, 19 Jun 2015 13:59:32 -0700 Subject: 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 --- .../android/camera/one/config/OneCameraFeatureConfigCreator.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src') 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. -- cgit v1.2.3