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

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

Snap for 4722539 from 7fe93ba5 to pi-release 

Change-Id: I1189105dd321d9cbb282641bcac012233965ee41
parents ba70b643 7fe93ba5

camera/provider/2.4/default/CameraProvider.cpp

+2 −1
Original line number Diff line number Diff line
@@ -298,7 +298,8 @@ bool CameraProvider::initialize() { 
        return true;

    }



    mPreferredHal3MinorVersion = property_get_int32("ro.camera.wrapper.hal3TrebleMinorVersion", 3);

    mPreferredHal3MinorVersion =

        property_get_int32("ro.vendor.camera.wrapper.hal3TrebleMinorVersion", 3);

    ALOGV("Preferred HAL 3 minor version is %d", mPreferredHal3MinorVersion);

    switch(mPreferredHal3MinorVersion) {

        case 2:

compatibility_matrices/Android.mk

+23 −6
Original line number Diff line number Diff line
@@ -34,30 +34,47 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := framework_compatibility_matrix.legacy.xml

LOCAL_MODULE_STEM := compatibility_matrix.legacy.xml

LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)

LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0

LOCAL_KERNEL_VERSIONS := \

    3.18.0 \

    4.4.0 \

    4.9.0 \

    4.14.0 \



include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)



include $(CLEAR_VARS)

LOCAL_MODULE := framework_compatibility_matrix.1.xml

LOCAL_MODULE_STEM := compatibility_matrix.1.xml

LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)

LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0

LOCAL_KERNEL_VERSIONS := \

    3.18.0 \

    4.4.0 \

    4.9.0 \

    4.14.0 \



include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)



include $(CLEAR_VARS)

LOCAL_MODULE := framework_compatibility_matrix.2.xml

LOCAL_MODULE_STEM := compatibility_matrix.2.xml

LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)

LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0

include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)

LOCAL_KERNEL_VERSIONS := \

    3.18.0 \

    4.4.0 \

    4.9.0 \

    4.14.0 \



# TODO(b/72409164): STOPSHIP: update kernel version requirements

include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)



include $(CLEAR_VARS)

LOCAL_MODULE := framework_compatibility_matrix.3.xml

LOCAL_MODULE_STEM := compatibility_matrix.3.xml

LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)

LOCAL_KERNEL_VERSIONS := 4.4.0 4.9.0

LOCAL_KERNEL_VERSIONS := \

    4.4.0 \

    4.9.0 \

    4.14.0 \



include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)



# Framework Compatibility Matrix (common to all FCM versions)

current.txt

+2 −2
Original line number Diff line number Diff line
@@ -338,8 +338,8 @@ e15ebdf1e0a326ff5b8a59668d4d8cd3852bd88388eae91de13f5f7e1af50ed1 android.hardwar 
b8c7ed58aa8740361e63d0ce9e7c94227572a629f356958840b34809d2393a7c android.hardware.media.bufferpool@1.0::IClientManager

4a2c0dc82780e6c90731725a103feab8ab6ecf85a64e049b9cbd2b2c61620fe1 android.hardware.media.bufferpool@1.0::IConnection

6aef1218e5949f867b0104752ac536c1b707222a403341720de90141df129e3e android.hardware.media.bufferpool@1.0::types

3e4d8e0085ebe8549efb8ad4b8b400a141a3fa3f47ae23696b3e05a1612eb003 android.hardware.neuralnetworks@1.1::IDevice

50db076b03a6760557fc60ef433ba9dd2ff983cf3305eeb504b0fff3eaa604ff android.hardware.neuralnetworks@1.1::types

7698dc2382a2eeb43541840e3ee624f34108efdfb976b2bfa7c13ef15fb8c4c4 android.hardware.neuralnetworks@1.1::IDevice

5604001029a255648a9e955de0a822a48d9ba7cc259b106fb8be0cd43dc8eece android.hardware.neuralnetworks@1.1::types

8d3d86da0bfa4bf070970d8303c659f67f35d670c287d45a3f542e4fedadd578 android.hardware.nfc@1.1::INfc

e85f566698d2a2c28100e264fcf2c691a066756ddf8dd341d009ff50cfe10614 android.hardware.nfc@1.1::INfcClientCallback

5e278fcaa3287d397d8eebe1c22aaa28150f5caae1cf9381cd6dc32cb37899c5 android.hardware.nfc@1.1::types

neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp

+2 −2
Original line number Diff line number Diff line
@@ -242,8 +242,8 @@ void Execute(const sp<V1_1::IDevice>& device, std::function<V1_1::Model(void)> c 
    // launch prepare model

    sp<PreparedModelCallback> preparedModelCallback = new PreparedModelCallback();

    ASSERT_NE(nullptr, preparedModelCallback.get());

    Return<ErrorStatus> prepareLaunchStatus =

        device->prepareModel_1_1(model, preparedModelCallback);

    Return<ErrorStatus> prepareLaunchStatus = device->prepareModel_1_1(

        model, ExecutionPreference::FAST_SINGLE_ANSWER, preparedModelCallback);

    ASSERT_TRUE(prepareLaunchStatus.isOk());

    ASSERT_EQ(ErrorStatus::NONE, static_cast<ErrorStatus>(prepareLaunchStatus));

neuralnetworks/1.1/IDevice.hal

+4 −1
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ interface IDevice extends @1.0::IDevice { 
     * Multiple threads can call prepareModel on the same model concurrently.

     *

     * @param model The model to be prepared for execution.

     * @param preference Indicates the intended execution behavior of a prepared

     *                   model.

     * @param callback A callback object used to return the error status of

     *                 preparing the model for execution and the prepared model

     *                 if successful, nullptr otherwise. The callback object's
@@ -115,6 +117,7 @@ interface IDevice extends @1.0::IDevice { 
     *                - INVALID_ARGUMENT if one of the input arguments is

     *                  invalid

     */

    prepareModel_1_1(Model model, IPreparedModelCallback callback)

    prepareModel_1_1(Model model, ExecutionPreference preference,

                     IPreparedModelCallback callback)

          generates (ErrorStatus status);

};