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

Unverified Commit 372a94d1 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-14.0.0_r50' into staging/lineage-21.0_merge-android-14.0.0_r50 

Android 14.0.0 Release 50 (AP2A.240605.024)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZmdzpQAKCRDorT+BmrEO
# eJLtAJ43wF6qlq+J5XXdLJ+yWK58/er2DACfacvUKEF8Ioc8D8q6EaNj1laJ59M=
# =oxwW
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 11 00:44:05 2024 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2480 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Andy Hung (28) and others
# Via Automerger Merge Worker (486) and others
* tag 'android-14.0.0_r50': (357 commits)
  MPEG4Writer: Remove timestamp validation
  VTS: check ro.vendor.api_level instead of ro.board.(first_)api_level
  Revert "Introduce AttributionAndPermissionUtils."
  Fix playbackHeadPosition after starting tracks with a startThresholdInFrames
  Add Java library to query state of VirtualCamera build flag.
  Fail if there's problem with tmp buffer during JPEG capture
  Only add the AIDL manifest decl when using unfrozen
  Remove Android.mk files which are not needed any more.
  Extend output format with downscalable resolutions
  AudioStreamOut: Align with AudioStreamIn
  Improve AudioMix registration/unregistration
  android.media.codec-aconfig-cc: Set double_loadable to true
  EffectBufferHalAidl: remove ashmem mapping
  AudioPolicyService: Make device effect init synchronous
  AudioSystem: Move AudioPolicyService fetch to ServiceHandler
  VtsHalMediaC2: start thread pool
  media.c2 client: fix # of queried param count
  Spatializer: replace parameters with AIDL type
  AudioSystem: Move AudioFlinger fetch to ServiceHandler
  audiosystem_tests: Fix false test failures
  ...

 Conflicts:
	media/codec2/sfplugin/CCodecBufferChannel.cpp
	services/camera/libcameraservice/utils/SessionConfigurationUtils.h

Change-Id: Icadd2c7d79ab43dc7e7a740d9afc01d21f16ce6e
parents 7dc5885c 3ac36cbd

Android.bp

+8 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ cc_library_headers { 


aidl_interface {

    name: "av-audio-types-aidl",

    unstable: true,

    host_supported: true,

    vendor_available: true,

    double_loadable: true,
@@ -125,4 +124,12 @@ aidl_interface { 
            sdk_version: "module_current",

        },

    },

    versions_with_info: [

        {

            version: "1",

            imports: ["android.hardware.audio.core-V2"],

        },

    ],

    frozen: true,



}

aidl/android/media/audio/IHalAdapterVendorExtension.aidl

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import android.hardware.audio.core.VendorParameter; 
 * is optional. Vendors may provide an implementation on the system_ext

 * partition. The default instance of this interface, if provided, must be

 * registered prior to the moment when the audio server connects to HAL modules.

 * Vendors need to set the system property `ro.audio.ihaladaptervendorextension_enabled`

 * to `true` for the framework to bind to this service.

 *

 * {@hide}

 */

aidl_api/av-audio-types-aidl/1/.hash

0 → 100644
+1 −0
Original line number Diff line number Diff line 
ef1bc5ed9db445fbfc116cdec6e6ad081458ee40

aidl_api/av-audio-types-aidl/1/android/media/audio/IHalAdapterVendorExtension.aidl

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

 * Copyright (C) 2023 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.

 */

///////////////////////////////////////////////////////////////////////////////

// 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.media.audio;

/* @hide */

interface IHalAdapterVendorExtension {

  @utf8InCpp String[] parseVendorParameterIds(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in @utf8InCpp String rawKeys);

  void parseVendorParameters(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in @utf8InCpp String rawKeysAndValues, out android.hardware.audio.core.VendorParameter[] syncParameters, out android.hardware.audio.core.VendorParameter[] asyncParameters);

  android.hardware.audio.core.VendorParameter[] parseBluetoothA2dpReconfigureOffload(in @utf8InCpp String rawValue);

  android.hardware.audio.core.VendorParameter[] parseBluetoothLeReconfigureOffload(in @utf8InCpp String rawValue);

  @utf8InCpp String processVendorParameters(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in android.hardware.audio.core.VendorParameter[] parameters);

  enum ParameterScope {

    MODULE = 0,

    STREAM = 1,

  }

}

aidl_api/av-audio-types-aidl/current/android/media/audio/IHalAdapterVendorExtension.aidl

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

 * Copyright (C) 2023 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.

 */

///////////////////////////////////////////////////////////////////////////////

// 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.media.audio;

/* @hide */

interface IHalAdapterVendorExtension {

  @utf8InCpp String[] parseVendorParameterIds(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in @utf8InCpp String rawKeys);

  void parseVendorParameters(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in @utf8InCpp String rawKeysAndValues, out android.hardware.audio.core.VendorParameter[] syncParameters, out android.hardware.audio.core.VendorParameter[] asyncParameters);

  android.hardware.audio.core.VendorParameter[] parseBluetoothA2dpReconfigureOffload(in @utf8InCpp String rawValue);

  android.hardware.audio.core.VendorParameter[] parseBluetoothLeReconfigureOffload(in @utf8InCpp String rawValue);

  @utf8InCpp String processVendorParameters(android.media.audio.IHalAdapterVendorExtension.ParameterScope scope, in android.hardware.audio.core.VendorParameter[] parameters);

  enum ParameterScope {

    MODULE = 0,

    STREAM = 1,

  }

}