From bd5b290fbf7a89f16d553c5fb77de7406634caec Mon Sep 17 00:00:00 2001 From: Jayant Chowdhary Date: Fri, 19 Jul 2019 09:53:35 -0700 Subject: [PATCH] camera/metadata/3.5 Add SYSTEM_CAMERA capability. Bug: 133508924 Bug: 138135081 Test: builds Change-Id: I67199769488b819f726d73a762f56980f9c94ca6 Signed-off-by: Jayant Chowdhary --- camera/metadata/3.5/Android.bp | 19 ++++++++++++++++ camera/metadata/3.5/types.hal | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 camera/metadata/3.5/Android.bp create mode 100644 camera/metadata/3.5/types.hal diff --git a/camera/metadata/3.5/Android.bp b/camera/metadata/3.5/Android.bp new file mode 100644 index 0000000000..4ebd069d3a --- /dev/null +++ b/camera/metadata/3.5/Android.bp @@ -0,0 +1,19 @@ +// This file is autogenerated by hidl-gen -Landroidbp. + +hidl_interface { + name: "android.hardware.camera.metadata@3.5", + root: "android.hardware", + vndk: { + enabled: true, + }, + srcs: [ + "types.hal", + ], + interfaces: [ + "android.hardware.camera.metadata@3.2", + "android.hardware.camera.metadata@3.3", + "android.hardware.camera.metadata@3.4", + ], + gen_java: true, +} + diff --git a/camera/metadata/3.5/types.hal b/camera/metadata/3.5/types.hal new file mode 100644 index 0000000000..0fec947b97 --- /dev/null +++ b/camera/metadata/3.5/types.hal @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Autogenerated from camera metadata definitions in + * /system/media/camera/docs/metadata_definitions.xml + * *** DO NOT EDIT BY HAND *** + */ + +package android.hardware.camera.metadata@3.5; + +import android.hardware.camera.metadata@3.2; +import android.hardware.camera.metadata@3.3; +import android.hardware.camera.metadata@3.4; + +// No new metadata sections added in this revision + +/* + * Enumeration definitions for the various entries that need them + */ + +/** android.request.availableCapabilities enumeration values added since v3.4 + * @see ANDROID_REQUEST_AVAILABLE_CAPABILITIES + */ +enum CameraMetadataEnumAndroidRequestAvailableCapabilities : + @3.4::CameraMetadataEnumAndroidRequestAvailableCapabilities { + ANDROID_REQUEST_AVAILABLE_CAPABILITIES_SYSTEM_CAMERA, +};