Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 886f7390 authored by Rucha Katakwar's avatar Rucha Katakwar Committed by Android (Google) Code Review
Browse files

Merge "Camera: Flash strength control during camera use." into main

parents 59414af0 5d0f9d16

camera/metadata/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ aidl_interface { 
    name: "android.hardware.camera.metadata",

    vendor_available: true,

    srcs: ["android/hardware/camera/metadata/*.aidl"],

    frozen: true,

    frozen: false,

    stability: "vintf",

    backend: {

        cpp: {

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataTag.aidl

+5 −0
Original line number Diff line number Diff line
@@ -108,6 +108,11 @@ enum CameraMetadataTag { 
  ANDROID_FLASH_COLOR_TEMPERATURE,

  ANDROID_FLASH_MAX_ENERGY,

  ANDROID_FLASH_STATE,

  ANDROID_FLASH_STRENGTH_LEVEL,

  ANDROID_FLASH_SINGLE_STRENGTH_MAX_LEVEL,

  ANDROID_FLASH_SINGLE_STRENGTH_DEFAULT_LEVEL,

  ANDROID_FLASH_TORCH_STRENGTH_MAX_LEVEL,

  ANDROID_FLASH_TORCH_STRENGTH_DEFAULT_LEVEL,

  ANDROID_FLASH_INFO_AVAILABLE = android.hardware.camera.metadata.CameraMetadataSectionStart.ANDROID_FLASH_INFO_START /* 327680 */,

  ANDROID_FLASH_INFO_CHARGE_DURATION,

  ANDROID_FLASH_INFO_STRENGTH_MAXIMUM_LEVEL,

camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataTag.aidl

+30 −0
Original line number Diff line number Diff line
@@ -559,6 +559,36 @@ enum CameraMetadataTag { 
     * unit.</p>

     */

    ANDROID_FLASH_STATE,

    /**

     * android.flash.strengthLevel [dynamic, int32, public]

     *

     * <p>Flash strength level to be used when manual flash control is active.</p>

     */

    ANDROID_FLASH_STRENGTH_LEVEL,

    /**

     * android.flash.singleStrengthMaxLevel [static, int32, public]

     *

     * <p>Maximum flash brightness level for manual flash control in SINGLE mode.</p>

     */

    ANDROID_FLASH_SINGLE_STRENGTH_MAX_LEVEL,

    /**

     * android.flash.singleStrengthDefaultLevel [static, int32, public]

     *

     * <p>Default flash brightness level for manual flash control in SINGLE mode.</p>

     */

    ANDROID_FLASH_SINGLE_STRENGTH_DEFAULT_LEVEL,

    /**

     * android.flash.torchStrengthMaxLevel [static, int32, public]

     *

     * <p>Maximum flash brightness level for manual flash control in TORCH mode</p>

     */

    ANDROID_FLASH_TORCH_STRENGTH_MAX_LEVEL,

    /**

     * android.flash.torchStrengthDefaultLevel [static, int32, public]

     *

     * <p>Default flash brightness level for manual flash control in TORCH mode</p>

     */

    ANDROID_FLASH_TORCH_STRENGTH_DEFAULT_LEVEL,

    /**

     * android.flash.info.available [static, enum, public]

     *