From 7fb2fbdd754fdf7e01df19ad27115e9e74843a51 Mon Sep 17 00:00:00 2001 From: Dario Freni Date: Tue, 5 Dec 2023 12:22:58 +0000 Subject: [PATCH] Revert "Camera: Low Light Boost AE Mode" Revert submission 25492993-low-light-boost-control Reason for revert: b/314882897 breaking tests Reverted changes: /q/submissionid:25492993-low-light-boost-control Change-Id: I88c0401ee4881a79591fda76bd8c958d7e49b3cd --- .../camera/metadata/CameraMetadataTag.aidl | 2 - .../camera/metadata/ControlAeMode.aidl | 1 - .../metadata/ControlLowLightBoostState.aidl | 43 ------------------- .../camera/metadata/CameraMetadataTag.aidl | 12 ------ .../camera/metadata/ControlAeMode.aidl | 1 - .../metadata/ControlLowLightBoostState.aidl | 34 --------------- 6 files changed, 93 deletions(-) delete mode 100644 camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/ControlLowLightBoostState.aidl delete mode 100644 camera/metadata/aidl/android/hardware/camera/metadata/ControlLowLightBoostState.aidl diff --git a/camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataTag.aidl b/camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataTag.aidl index 542b296272..b04e486a33 100644 --- a/camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataTag.aidl +++ b/camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataTag.aidl @@ -98,8 +98,6 @@ enum CameraMetadataTag { ANDROID_CONTROL_AUTOFRAMING, ANDROID_CONTROL_AUTOFRAMING_AVAILABLE, ANDROID_CONTROL_AUTOFRAMING_STATE, - ANDROID_CONTROL_LOW_LIGHT_BOOST_INFO_LUMINANCE_RANGE, - ANDROID_CONTROL_LOW_LIGHT_BOOST_STATE, ANDROID_DEMOSAIC_MODE = android.hardware.camera.metadata.CameraMetadataSectionStart.ANDROID_DEMOSAIC_START /* 131072 */, ANDROID_EDGE_MODE = android.hardware.camera.metadata.CameraMetadataSectionStart.ANDROID_EDGE_START /* 196608 */, ANDROID_EDGE_STRENGTH, diff --git a/camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/ControlAeMode.aidl b/camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/ControlAeMode.aidl index c1423aa87e..5e1b87178e 100644 --- a/camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/ControlAeMode.aidl +++ b/camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/ControlAeMode.aidl @@ -44,5 +44,4 @@ enum ControlAeMode { ANDROID_CONTROL_AE_MODE_ON_ALWAYS_FLASH, ANDROID_CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE, ANDROID_CONTROL_AE_MODE_ON_EXTERNAL_FLASH, - ANDROID_CONTROL_AE_MODE_ON_LOW_LIGHT_BOOST_BRIGHTNESS_PRIORITY, } diff --git a/camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/ControlLowLightBoostState.aidl b/camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/ControlLowLightBoostState.aidl deleted file mode 100644 index f8ae0130de..0000000000 --- a/camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/ControlLowLightBoostState.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2022 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 *** - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.camera.metadata; -@Backing(type="int") @VintfStability -enum ControlLowLightBoostState { - ANDROID_CONTROL_LOW_LIGHT_BOOST_STATE_INACTIVE, - ANDROID_CONTROL_LOW_LIGHT_BOOST_STATE_ACTIVE, -} diff --git a/camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataTag.aidl b/camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataTag.aidl index 6f9b38f9cf..2fefce0147 100644 --- a/camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataTag.aidl +++ b/camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataTag.aidl @@ -489,18 +489,6 @@ enum CameraMetadataTag { *

Current state of auto-framing.

*/ ANDROID_CONTROL_AUTOFRAMING_STATE, - /** - * android.control.lowLightBoostInfoLuminanceRange [static, float[], public] - * - *

The operating luminance range of low light boost measured in lux (lx).

- */ - ANDROID_CONTROL_LOW_LIGHT_BOOST_INFO_LUMINANCE_RANGE, - /** - * android.control.lowLightBoostState [dynamic, enum, public] - * - *

Current state of the low light boost AE mode.

- */ - ANDROID_CONTROL_LOW_LIGHT_BOOST_STATE, /** * android.demosaic.mode [controls, enum, system] * diff --git a/camera/metadata/aidl/android/hardware/camera/metadata/ControlAeMode.aidl b/camera/metadata/aidl/android/hardware/camera/metadata/ControlAeMode.aidl index 70174bed27..e2f5553aee 100644 --- a/camera/metadata/aidl/android/hardware/camera/metadata/ControlAeMode.aidl +++ b/camera/metadata/aidl/android/hardware/camera/metadata/ControlAeMode.aidl @@ -35,5 +35,4 @@ enum ControlAeMode { ANDROID_CONTROL_AE_MODE_ON_ALWAYS_FLASH, ANDROID_CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE, ANDROID_CONTROL_AE_MODE_ON_EXTERNAL_FLASH, - ANDROID_CONTROL_AE_MODE_ON_LOW_LIGHT_BOOST_BRIGHTNESS_PRIORITY, } diff --git a/camera/metadata/aidl/android/hardware/camera/metadata/ControlLowLightBoostState.aidl b/camera/metadata/aidl/android/hardware/camera/metadata/ControlLowLightBoostState.aidl deleted file mode 100644 index 67591c8067..0000000000 --- a/camera/metadata/aidl/android/hardware/camera/metadata/ControlLowLightBoostState.aidl +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2022 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; - -/** - * android.control.lowLightBoostState enumeration values - * @see ANDROID_CONTROL_LOW_LIGHT_BOOST_STATE - */ -@VintfStability -@Backing(type="int") -enum ControlLowLightBoostState { - ANDROID_CONTROL_LOW_LIGHT_BOOST_STATE_INACTIVE, - ANDROID_CONTROL_LOW_LIGHT_BOOST_STATE_ACTIVE, -}