diff options
| author | Alan Newberger <alann@google.com> | 2014-07-30 19:16:22 -0700 |
|---|---|---|
| committer | Alan Newberger <alann@google.com> | 2014-07-30 19:16:22 -0700 |
| commit | 15773a64b42023e31e2aade23ae44273862a9c04 (patch) | |
| tree | 647015b37a956c6b12dac00dfb6d11eeb7be9411 | |
| parent | 9b5facd03adbb55f6a1faa49788308f763a54ff0 (diff) | |
| download | android_frameworks_ex-15773a64b42023e31e2aade23ae44273862a9c04.tar.gz android_frameworks_ex-15773a64b42023e31e2aade23ae44273862a9c04.tar.bz2 android_frameworks_ex-15773a64b42023e31e2aade23ae44273862a9c04.zip | |
add TORCH support to camera1 portability library
In the move to the portability library, TORCH mode got dropped.
Bug: 16680156
Change-Id: I3878c2399246bdb5cc80311c49533971c0c4c3d2
| -rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java index 14fcaaa..acff9c6 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java @@ -182,6 +182,8 @@ class AndroidCameraCapabilities extends CameraCapabilities { mSupportedFlashModes.add(FlashMode.ON); } else if (Camera.Parameters.FLASH_MODE_RED_EYE.equals(flash)) { mSupportedFlashModes.add(FlashMode.RED_EYE); + } else if (Camera.Parameters.FLASH_MODE_TORCH.equals(flash)) { + mSupportedFlashModes.add(FlashMode.TORCH); } } } |