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

Commit a8723646 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4686875 from 55b92198 to pi-release 

Change-Id: I26a28e0e4a40925eb5f400559b3f9acf8cbf10d2
parents 3855d757 55b92198

audio/effect/4.0/xml/audio_effects_conf_V4_0.xsd

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../2.0/xml/audio_effects_conf_V2_0.xsd
 
 No newline at end of file

broadcastradio/1.1/default/Tuner.cpp

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ void Tuner::setConfigurationInternalLocked(const BandConfig& config) { 


    mIsAmfmConfigSet = true;

    mCallback->configChange(Result::OK, mAmfmConfig);

    if (mCallback1_1 != nullptr) mCallback1_1->programListChanged();

}



bool Tuner::autoConfigureLocked(uint64_t frequency) {

camera/metadata/3.3/types.hal

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ enum CameraMetadataEnumAndroidRequestAvailableCapabilities : 
        @3.2::CameraMetadataEnumAndroidRequestAvailableCapabilities {

    ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MOTION_TRACKING,

    ANDROID_REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA,

    ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MONOCHROME,

};



/** android.statistics.oisDataMode enumeration values

compatibility_matrices/Android.mk

+36 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ BUILD_FRAMEWORK_COMPATIBILITY_MATRIX := $(LOCAL_PATH)/compatibility_matrix.mk 
LOCAL_ADD_VBMETA_VERSION :=

LOCAL_ASSEMBLE_VINTF_ENV_VARS :=

LOCAL_ASSEMBLE_VINTF_FLAGS :=

LOCAL_WARN_REQUIRED_HALS :=

LOCAL_KERNEL_VERSIONS :=

LOCAL_GEN_FILE_DEPENDENCIES :=
@@ -57,14 +58,46 @@ include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) 
# Framework Compatibility Matrix (common to all FCM versions)



include $(CLEAR_VARS)

LOCAL_MODULE_STEM := compatibility_matrix.empty.xml

LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)

LOCAL_MODULE_STEM := compatibility_matrix.device.xml

# define LOCAL_MODULE and LOCAL_MODULE_CLASS for local-generated-sources-dir.

LOCAL_MODULE := framework_compatibility_matrix.device.xml

LOCAL_MODULE_CLASS := ETC



ifndef DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE

LOCAL_SRC_FILES := compatibility_matrix.empty.xml

else



# DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE specify an absolute path

LOCAL_GENERATED_SOURCES := $(DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE)



# Enforce that DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE does not specify required HALs

# by checking it against an empty manifest. But the empty manifest needs to contain

# BOARD_SEPOLICY_VERS to be compatible with DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE.

my_manifest_src_file := $(LOCAL_PATH)/manifest.empty.xml

my_gen_check_manifest := $(local-generated-sources-dir)/manifest.check.xml

$(my_gen_check_manifest): PRIVATE_SRC_FILE := $(my_manifest_src_file)

$(my_gen_check_manifest): $(my_manifest_src_file) $(HOST_OUT_EXECUTABLES)/assemble_vintf

	BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) \

	IGNORE_TARGET_FCM_VERSION=true \

		$(HOST_OUT_EXECUTABLES)/assemble_vintf -i $(PRIVATE_SRC_FILE) -o $@



LOCAL_GEN_FILE_DEPENDENCIES += $(my_gen_check_manifest)

LOCAL_ASSEMBLE_VINTF_FLAGS += -c "$(my_gen_check_manifest)"



my_gen_check_manifest :=

my_manifest_src_file :=



endif # DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE



LOCAL_ADD_VBMETA_VERSION := true

LOCAL_ASSEMBLE_VINTF_ENV_VARS := \

    POLICYVERS \

    PLATFORM_SEPOLICY_VERSION \

    PLATFORM_SEPOLICY_COMPAT_VERSIONS



LOCAL_WARN_REQUIRED_HALS := \

    "Error: DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX cannot contain required HALs."



include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)



# Framework Compatibility Matrix
@@ -78,7 +111,7 @@ LOCAL_REQUIRED_MODULES := \ 
    framework_compatibility_matrix.1.xml \

    framework_compatibility_matrix.2.xml \

    framework_compatibility_matrix.current.xml \

    framework_compatibility_matrix.empty.xml

    framework_compatibility_matrix.device.xml

LOCAL_GENERATED_SOURCES := $(call module-installed-files,$(LOCAL_REQUIRED_MODULES))



ifdef BUILT_VENDOR_MANIFEST

compatibility_matrices/compatibility_matrix.current.xml

+19 −8
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
        <version>2.4</version>

        <interface>

            <name>ICameraProvider</name>

            <instance>legacy/0</instance>

            <regex-instance>[^/]+/[0-9]+</regex-instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">
@@ -103,16 +103,28 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

    <hal format="hidl" optional="true">

        <name>android.hardware.drm</name>

        <version>1.0</version>

        <interface>

            <name>ICryptoFactory</name>

            <instance>default</instance>

            <regex-instance>.*</regex-instance>

        </interface>

        <interface>

            <name>IDrmFactory</name>

            <instance>default</instance>

            <regex-instance>.*</regex-instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

        <name>android.hardware.drm</name>

        <version>1.1</version>

        <interface>

            <name>ICryptoFactory</name>

            <regex-instance>.*</regex-instance>

        </interface>

        <interface>

            <name>IDrmFactory</name>

            <regex-instance>.*</regex-instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">
@@ -225,8 +237,7 @@ 
        <version>1.0</version>

        <interface>

            <name>IDevice</name>

            <!-- TODO(b/73738616): This should be * (match any) -->

            <instance>hvx</instance>

            <regex-instance>.*</regex-instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">
@@ -258,11 +269,11 @@ 
        <version>1.0-1</version>

        <interface>

            <name>IRadio</name>

            <instance>slot1</instance>

            <regex-instance>slot[0-9]+</regex-instance>

        </interface>

        <interface>

            <name>ISap</name>

            <instance>slot1</instance>

            <regex-instance>slot[0-9]+</regex-instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">