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

Commit 54d7fb50 authored by Jayant Chowdhary's avatar Jayant Chowdhary
Browse files

Add automotive related keys to AIDL. 



This CL adds a new automotive metadata section with below fields:
- AUTOMOTIVE_LOCATION describes where the camera exists.
- AUTOMOTIVE_LENS_FACING tells where the camera's lens is facing toward.

These were added to the temporary HIDL interface but not AIDL.

Bug: 223262543

Test: build

Change-Id: Id074c6878690767c89792f867a7754ae8193405d
Signed-off-by: default avatarJayant Chowdhary <jchowdhary@google.com>
parent 68b9acc4

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

0 → 100644
+56 −0
Original line number Diff line number Diff line 
/*

 * 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 <name>-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 AutomotiveLensFacing {

  ANDROID_AUTOMOTIVE_LENS_FACING_EXTERIOR_OTHER = 0,

  ANDROID_AUTOMOTIVE_LENS_FACING_EXTERIOR_FRONT = 1,

  ANDROID_AUTOMOTIVE_LENS_FACING_EXTERIOR_REAR = 2,

  ANDROID_AUTOMOTIVE_LENS_FACING_EXTERIOR_LEFT = 3,

  ANDROID_AUTOMOTIVE_LENS_FACING_EXTERIOR_RIGHT = 4,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_OTHER = 5,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_1_LEFT = 6,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_1_CENTER = 7,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_1_RIGHT = 8,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_2_LEFT = 9,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_2_CENTER = 10,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_2_RIGHT = 11,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_3_LEFT = 12,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_3_CENTER = 13,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_3_RIGHT = 14,

}

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

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/*

 * 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 <name>-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 AutomotiveLocation {

  ANDROID_AUTOMOTIVE_LOCATION_INTERIOR = 0,

  ANDROID_AUTOMOTIVE_LOCATION_EXTERIOR_OTHER = 1,

  ANDROID_AUTOMOTIVE_LOCATION_EXTERIOR_FRONT = 2,

  ANDROID_AUTOMOTIVE_LOCATION_EXTERIOR_REAR = 3,

  ANDROID_AUTOMOTIVE_LOCATION_EXTERIOR_LEFT = 4,

  ANDROID_AUTOMOTIVE_LOCATION_EXTERIOR_RIGHT = 5,

  ANDROID_AUTOMOTIVE_LOCATION_EXTRA_OTHER = 6,

  ANDROID_AUTOMOTIVE_LOCATION_EXTRA_FRONT = 7,

  ANDROID_AUTOMOTIVE_LOCATION_EXTRA_REAR = 8,

  ANDROID_AUTOMOTIVE_LOCATION_EXTRA_LEFT = 9,

  ANDROID_AUTOMOTIVE_LOCATION_EXTRA_RIGHT = 10,

}

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

+2 −0
Original line number Diff line number Diff line
@@ -68,5 +68,7 @@ enum CameraMetadataSection { 
  ANDROID_DISTORTION_CORRECTION = 27,

  ANDROID_HEIC = 28,

  ANDROID_HEIC_INFO = 29,

  ANDROID_AUTOMOTIVE = 30,

  ANDROID_AUTOMOTIVE_LENS = 31,

  VENDOR_SECTION = 32768,

}

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

+2 −0
Original line number Diff line number Diff line
@@ -68,5 +68,7 @@ enum CameraMetadataSectionStart { 
  ANDROID_DISTORTION_CORRECTION_START = 1769472,

  ANDROID_HEIC_START = 1835008,

  ANDROID_HEIC_INFO_START = 1900544,

  ANDROID_AUTOMOTIVE_START = 1966080,

  ANDROID_AUTOMOTIVE_LENS_START = 2031616,

  VENDOR_SECTION_START = -2147483648,

}

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

+2 −0
Original line number Diff line number Diff line
@@ -325,4 +325,6 @@ enum CameraMetadataTag { 
  ANDROID_HEIC_AVAILABLE_HEIC_STALL_DURATIONS_MAXIMUM_RESOLUTION = 1835013,

  ANDROID_HEIC_INFO_SUPPORTED = 1900544,

  ANDROID_HEIC_INFO_MAX_JPEG_APP_SEGMENTS_COUNT = 1900545,

  ANDROID_AUTOMOTIVE_LOCATION = 1966080,

  ANDROID_AUTOMOTIVE_LENS_FACING = 2031616,

}