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

Commit a7371412 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 14" into main

parents df7f1d5f 0321b51e

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -85,3 +85,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.cas@ 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.cas@1.1*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.cas@1.1*)

$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/wifi/1.4/android.hardware.wifi@1.4-adapter_genc++/)

$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/automotive/vehicle/aidl/android.hardware.automotive.vehicle-V2-ndk-source/)

audio/README.md

+22 −3
Original line number Diff line number Diff line
@@ -2,10 +2,29 @@ 


Directory structure of the audio HAL related code.



Run `common/all-versions/copyHAL.sh` to create a new version of the audio HAL

based on an existing one.

## Directory Structure for AIDL audio HAL



## Directory Structure

The AIDL version is located inside `aidl` directory. The tree below explains

the role of each subdirectory:



* `aidl_api` — snapshots of the API created each Android release. Every

  release, the current version of the API becomes "frozen" and gets assigned

  the next version number. If the API needs further modifications, they are

  made on the "current" version. After making modifications, run

  `m <package name>-update-api` to update the snapshot of the "current"

  version.

* `android/hardware/audio/common` — data structures and interfaces shared

  between various HALs: BT HAL, core and effects audio HALs.

* `android/hardware/audio/core` — data structures and interfaces of the

  core audio HAL.

* `default` — the default, reference implementation of the audio HAL service.

* `vts` — VTS tests for the AIDL HAL.



## Directory Structure for HIDL audio HAL



Run `common/all-versions/copyHAL.sh` to create a new version of the HIDL audio

HAL based on an existing one. Note that this isn't possible since Android T

release. Android U and above uses AIDL audio HAL.



* `2.0` — version 2.0 of the core HIDL API. Note that `.hal` files

  can not be moved into the `core` directory because that would change

audio/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,6 @@ aidl_interface { 
            sdk_version: "module_current",

        },

    },

    frozen: true,

    versions_with_info: [

        {

            version: "1",
@@ -304,6 +303,7 @@ aidl_interface { 
            ],

        },

    ],

    frozen: true,



}

audio/aidl/default/config/audioPolicy/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -279,8 +279,10 @@ package android.audio.policy.configuration { 
    method @NonNull public String getRawName();

    enum_constant public static final android.audio.policy.configuration.AudioInOutFlag AUDIO_INPUT_FLAG_DIRECT;

    enum_constant public static final android.audio.policy.configuration.AudioInOutFlag AUDIO_INPUT_FLAG_FAST;

    enum_constant public static final android.audio.policy.configuration.AudioInOutFlag AUDIO_INPUT_FLAG_HOTWORD_TAP;

    enum_constant public static final android.audio.policy.configuration.AudioInOutFlag AUDIO_INPUT_FLAG_HW_AV_SYNC;

    enum_constant public static final android.audio.policy.configuration.AudioInOutFlag AUDIO_INPUT_FLAG_HW_HOTWORD;

    enum_constant public static final android.audio.policy.configuration.AudioInOutFlag AUDIO_INPUT_FLAG_HW_LOOKBACK;

    enum_constant public static final android.audio.policy.configuration.AudioInOutFlag AUDIO_INPUT_FLAG_MMAP_NOIRQ;

    enum_constant public static final android.audio.policy.configuration.AudioInOutFlag AUDIO_INPUT_FLAG_RAW;

    enum_constant public static final android.audio.policy.configuration.AudioInOutFlag AUDIO_INPUT_FLAG_SYNC;

audio/aidl/default/config/audioPolicy/audio_policy_configuration.xsd

+2 −0
Original line number Diff line number Diff line
@@ -191,6 +191,8 @@ 
            <xs:enumeration value="AUDIO_INPUT_FLAG_HW_AV_SYNC" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_DIRECT" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_ULTRASOUND" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_HOTWORD_TAP" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_HW_LOOKBACK" />

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="audioInOutFlags">