diff options
| author | Alan Newberger <alann@google.com> | 2015-06-19 22:34:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-19 22:34:42 +0000 |
| commit | a596ed322aacf2ba005c95d4ae536ddb5f00a6c6 (patch) | |
| tree | 27af108c1a20a5e299821aef434d176f7e676946 | |
| parent | cdbb62b8987ea1cb8ae92f37b80df37c78551adb (diff) | |
| parent | d3611d6a86f46fb877e5260410ddd6389445be1e (diff) | |
| download | android_packages_apps_Camera2-a596ed322aacf2ba005c95d4ae536ddb5f00a6c6.tar.gz android_packages_apps_Camera2-a596ed322aacf2ba005c95d4ae536ddb5f00a6c6.tar.bz2 android_packages_apps_Camera2-a596ed322aacf2ba005c95d4ae536ddb5f00a6c6.zip | |
am d3611d6a: AOSP Camera source should run camera2 API on M
* commit 'd3611d6a86f46fb877e5260410ddd6389445be1e':
AOSP Camera source should run camera2 API on M
| -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. |