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

Unverified Commit 5143e924 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6 

Android 15.0.0 Release 6 (AP4A.241205.013)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssgAKCRDorT+BmrEO
# eAQDAJ0Y9tLkI/9E6JFvvf9DIGZxnCabgQCghIthWz3dPjsuoGGuJCLjmZMbBXs=
# =kzIy
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:02 2024 EET
# 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 2468 signatures in the past
#      3 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 Yu Shan (18) and others
# Via Automerger Merge Worker (504) and others
* tag 'android-15.0.0_r6': (241 commits)
  [RESTRICT AUTOMERGE] HapticGenerator VTS: validate parameter before setting
  Inject getS2rS2dConfig through constructor.
  Use static libjsoncpp for unit tests.
  audio: Update FMQ error reporting handler
  Face VHAL for user build
  VtsHalBluetoothTargetTest: Check API level compatibility
  Align EffectContext workbuffer size to FMQ size
  Add RSN overriding feature flag
  wifi: Update Supplicant HAL to V4
  Replace "UDS_Public" with "UDS_Pub" for consistency
  Mark vhal property protos library to be available in any APEX
  VisualizerTest: Add tests for visualizer effect parameters
  Change documentation for AP_POWER_STATE_REQ
  Add frozen field to vibrator
  Nfc AIdl interface updated following
  Camera: Remove flag manual_flash_strength_control
  Do not force verbose logs on for anything including ComposerCommandBuffer.h
  Revert^2 "Support PER_DISPLAY_BRIGHTNESS."
  audio: Disable I/O tests for input MMap streams
  Enable Rust backend on Keymint, Fingerprint and Biometrics interfaces
  ...

Change-Id: I18ad17d1e07299d8fe23b8ce8b6b6bbee013765f
parents 04b72f48 b04e2f3d

Android.bp

+1 −10
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ cc_defaults { 
    // Lists all dependencies that can *not* be expected on the device.

    static_libs: [

        "VtsHalHidlTestUtils",

        "libhidlbase",

        "libhidl-gen-utils",

    ],
@@ -64,8 +63,8 @@ cc_defaults { 
        "libbase",

        // All the following are dependencies of any HAL definition library.

        "libcutils",

        "liblog",

        "libhidlbase",

        "liblog",

        "libutils",

    ],

    cflags: [
@@ -73,14 +72,6 @@ cc_defaults { 
        "-g",

    ],



    target: {

        android: {

            shared_libs: [

                "libvndksupport",

            ],

        },

    },



    require_root: true,

}

PREUPLOAD.cfg

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ ignore_merged_commits = true 
bpfmt = true

clang_format = true

aidl_format = true

gofmt = true



[Hook Scripts]

aosp_hook_confirmationui = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} confirmationui

audio/OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ 


elaurent@google.com

mnaganov@google.com

yaoshunkai@google.com

audio/aidl/Android.bp

+8 −8
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ aidl_interface { 
        "android/hardware/audio/common/SinkMetadata.aidl",

        "android/hardware/audio/common/SourceMetadata.aidl",

    ],

    frozen: true,

    frozen: false,

    backend: {

        cpp: {

            enabled: true,
@@ -89,7 +89,7 @@ aidl_interface { 
}



// Note: This should always be one version ahead of the last frozen version

latest_android_hardware_audio_common = "android.hardware.audio.common-V3"

latest_android_hardware_audio_common = "android.hardware.audio.common-V4"



// Modules that depend on android.hardware.audio.common directly can include

// the following cc_defaults to avoid explicitly managing dependency versions
@@ -198,11 +198,11 @@ aidl_interface { 
        // IMPORTANT: Update latest_android_hardware_audio_core every time you

        // add the latest frozen version to versions_with_info

    ],

    frozen: true,

    frozen: false,

}



// Note: This should always be one version ahead of the last frozen version

latest_android_hardware_audio_core = "android.hardware.audio.core-V2"

latest_android_hardware_audio_core = "android.hardware.audio.core-V3"



// Modules that depend on android.hardware.audio.core directly can include

// the following cc_defaults to avoid explicitly managing dependency versions
@@ -260,11 +260,11 @@ aidl_interface { 
        // IMPORTANT: Update latest_android_hardware_audio_core_sounddose every time you

        // add the latest frozen version to versions_with_info

    ],

    frozen: true,

    frozen: false,

}



// Note: This should always be one version ahead of the last frozen version

latest_android_hardware_audio_core_sounddose = "android.hardware.audio.core.sounddose-V2"

latest_android_hardware_audio_core_sounddose = "android.hardware.audio.core.sounddose-V3"



// Modules that depend on android.hardware.audio.core.sounddose directly can include

// the following cc_defaults to avoid explicitly managing dependency versions
@@ -368,11 +368,11 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,



}



latest_android_hardware_audio_effect = "android.hardware.audio.effect-V2"

latest_android_hardware_audio_effect = "android.hardware.audio.effect-V3"



cc_defaults {

    name: "latest_android_hardware_audio_effect_ndk_shared",

audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/HapticGenerator.aidl

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ union HapticGenerator { 
  parcelable HapticScale {

    int id;

    android.hardware.audio.effect.HapticGenerator.VibratorScale scale = android.hardware.audio.effect.HapticGenerator.VibratorScale.MUTE;

    float scaleFactor = (-1.0f) /* -1.000000f */;

    float adaptiveScaleFactor = (-1.0f) /* -1.000000f */;

    const float UNDEFINED_SCALE_FACTOR = (-1.0f) /* -1.000000f */;

  }

  @VintfStability

  parcelable VibratorInformation {