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

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

Snap for 4787078 from 3569b027 to pi-release 

Change-Id: I8798ce790414a1e314c8c006699fa1fe31a046e7
parents 48d29a4a 3569b027

compatibility_matrices/Android.mk

+3 −3
Original line number Original line Diff line number Diff line
@@ -64,9 +64,9 @@ LOCAL_MODULE := framework_compatibility_matrix.3.xml 
LOCAL_MODULE_STEM := compatibility_matrix.3.xml

LOCAL_MODULE_STEM := compatibility_matrix.3.xml

LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)

LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)

LOCAL_KERNEL_CONFIG_DATA_PATHS := \

LOCAL_KERNEL_CONFIG_DATA_PATHS := \

    4.4.0:$(my_kernel_config_data)/p/android-4.4 \

    4.4.107:$(my_kernel_config_data)/p/android-4.4 \

    4.9.0:$(my_kernel_config_data)/p/android-4.9 \

    4.9.84:$(my_kernel_config_data)/p/android-4.9 \

    4.14.0:$(my_kernel_config_data)/p/android-4.14 \

    4.14.40:$(my_kernel_config_data)/p/android-4.14 \





include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)

include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)

compatibility_matrices/compatibility_matrix.3.xml

+11 −3
Original line number Original line Diff line number Diff line
@@ -87,6 +87,14 @@ 
            <instance>default</instance>

            <instance>default</instance>

        </interface>

        </interface>

    </hal>

    </hal>

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

        <name>android.hardware.broadcastradio</name>

        <version>2.0</version>

        <interface>

            <name>IBroadcastRadio</name>

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

        </interface>

    </hal>

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

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

        <name>android.hardware.camera.provider</name>

        <name>android.hardware.camera.provider</name>

        <version>2.4</version>

        <version>2.4</version>
@@ -185,7 +193,7 @@ 
    </hal>

    </hal>

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

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

        <name>android.hardware.graphics.composer</name>

        <name>android.hardware.graphics.composer</name>

        <version>2.1</version>

        <version>2.1-2</version>

        <interface>

        <interface>

            <name>IComposer</name>

            <name>IComposer</name>

            <instance>default</instance>

            <instance>default</instance>
@@ -193,7 +201,7 @@ 
    </hal>

    </hal>

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

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

        <name>android.hardware.graphics.mapper</name>

        <name>android.hardware.graphics.mapper</name>

        <version>2.0</version>

        <version>2.0-1</version>

        <interface>

        <interface>

            <name>IMapper</name>

            <name>IMapper</name>

            <instance>default</instance>

            <instance>default</instance>
@@ -258,7 +266,7 @@ 
    </hal>

    </hal>

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

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

        <name>android.hardware.neuralnetworks</name>

        <name>android.hardware.neuralnetworks</name>

        <version>1.0</version>

        <version>1.0-1</version>

        <interface>

        <interface>

            <name>IDevice</name>

            <name>IDevice</name>

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

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

current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -327,7 +327,7 @@ a830336ac8627d6432cfafb1b884343ad9f885dee0a5323e380e6d3c519156b8 android.hardwar 
83e7a10ff3702147bd7ffa04567b20d407a3b16bbb7705644af44d919afe9103 android.hardware.gnss@1.1::IGnssMeasurementCallback

83e7a10ff3702147bd7ffa04567b20d407a3b16bbb7705644af44d919afe9103 android.hardware.gnss@1.1::IGnssMeasurementCallback

0b96e0254e2168cfecb30c1ed5fb42681652cc00faa68c6e07568fafe64d1d50 android.hardware.graphics.common@1.1::types

0b96e0254e2168cfecb30c1ed5fb42681652cc00faa68c6e07568fafe64d1d50 android.hardware.graphics.common@1.1::types

d9b40a5b09962a5a0780b10fe33a4e607e69e2e088fc83de88a584115b7cb1c0 android.hardware.graphics.composer@2.2::IComposer

d9b40a5b09962a5a0780b10fe33a4e607e69e2e088fc83de88a584115b7cb1c0 android.hardware.graphics.composer@2.2::IComposer

18eff12102db47b03a5fa906f8d4fd9018f0fb9236c663d457b8eac8d57c2937 android.hardware.graphics.composer@2.2::IComposerClient

e7717f2ff2f6db43b24370ff08e14cd353da3004b32b17740e4a7ed4894b7e45 android.hardware.graphics.composer@2.2::IComposerClient

dd83be076b6b3f10ed62ab34d8c8b95f2415961fb785200eb842e7bfb2b0ee92 android.hardware.graphics.mapper@2.1::IMapper

dd83be076b6b3f10ed62ab34d8c8b95f2415961fb785200eb842e7bfb2b0ee92 android.hardware.graphics.mapper@2.1::IMapper

675682dd3007805c985eaaec91612abc88f4c25b3431fb84070b7584a1a741fb android.hardware.health@2.0::IHealth

675682dd3007805c985eaaec91612abc88f4c25b3431fb84070b7584a1a741fb android.hardware.health@2.0::IHealth

434c4c32c00b0e54bb05e40c79503208b40f786a318029a2a4f66e34f10f2a76 android.hardware.health@2.0::IHealthInfoCallback

434c4c32c00b0e54bb05e40c79503208b40f786a318029a2a4f66e34f10f2a76 android.hardware.health@2.0::IHealthInfoCallback

graphics/composer/2.2/IComposerClient.hal

+12 −1
Original line number Original line Diff line number Diff line
@@ -152,6 +152,11 @@ interface IComposerClient extends @2.1::IComposerClient { 
     * output of the display remains the same (subject to the note about protected

     * output of the display remains the same (subject to the note about protected

     * content in the description of setReadbackBuffer).

     * content in the description of setReadbackBuffer).

     *

     *

     * If the active configuration or color mode of this display has changed

     * since a previous call to this function, it must be called again prior to

     * setting a readback buffer such that the returned format and dataspace can

     * be updated accordingly.

     *

     * Parameters:

     * Parameters:

     * @param display - the display on which to create the layer.

     * @param display - the display on which to create the layer.

     *

     *
@@ -203,7 +208,13 @@ interface IComposerClient extends @2.1::IComposerClient { 
     *       must be non-NULL

     *       must be non-NULL

     * @return error - is HWC2_ERROR_NONE or one of the following errors:

     * @return error - is HWC2_ERROR_NONE or one of the following errors:

     *         BAD_DISPLAY - an invalid display handle was passed in

     *         BAD_DISPLAY - an invalid display handle was passed in

     *         UNSUPPORTED if not supported on underlying HAL

     *         NO_RESOURCES - the readback operation was successful, but

     *                        resulted in a different validate result than would

     *                        have occurred without readback

     *         UNSUPPORTED - the readback operation was unsuccessful because of

     *                       resource constraints, the presence of protected

     *                       content, or other reasons; -1 must be returned for

     *                       acquireFence

     *

     *

     * See also:

     * See also:

     *   getReadbackBufferAttributes

     *   getReadbackBufferAttributes

wifi/1.2/default/Android.mk

+3 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,9 @@ endif 
ifdef WIFI_HIDL_FEATURE_DUAL_INTERFACE

ifdef WIFI_HIDL_FEATURE_DUAL_INTERFACE

LOCAL_CPPFLAGS += -DWIFI_HIDL_FEATURE_DUAL_INTERFACE

LOCAL_CPPFLAGS += -DWIFI_HIDL_FEATURE_DUAL_INTERFACE

endif

endif

ifdef WIFI_HIDL_FEATURE_DISABLE_AP

LOCAL_CPPFLAGS += -DWIFI_HIDL_FEATURE_DISABLE_AP

endif

LOCAL_SRC_FILES := \

LOCAL_SRC_FILES := \

    hidl_struct_util.cpp \

    hidl_struct_util.cpp \

    hidl_sync_util.cpp \

    hidl_sync_util.cpp \