am 46ea9b0b: Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev

* commit '46ea9b0b0451a44fc30a646a6e1c4062f0b3d62d':
  camera2: Workaround for null FACE_DETECT_MODE crashing
This commit is contained in:
Igor Murashkin
2013-10-07 15:41:09 -07:00
committed by Android Git Automerger

View File

@@ -92,6 +92,15 @@ public class CameraMetadataNative extends CameraMetadata implements Parcelable {
@SuppressWarnings("unchecked")
@Override
public <T> T get(Key<T> key) {
if (key == CaptureResult.STATISTICS_FACES) {
/**
* FIXME: Workaround for HAL bug that's missing FACE_DETECT_MODE
*/
Log.w(TAG, "Expected non-null android.statistics.faceDetectMode");
return null;
}
T value = getOverride(key);
if (value != null) {
return value;