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

Commit 2bb34f24 authored by Bill Rassieur's avatar Bill Rassieur
Browse files

Merge master@5428150 into git_qt-dev-plus-aosp. 

Change-Id: I01849ef5640d2a60467655906503face7dcf6554
BUG: 129345239
parents 08465e2c 019d89b7

atrace/1.0/default/AtraceDevice.cpp

+14 −13
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ using ::android::hardware::atrace::V1_0::TracingCategory; 


struct TracingConfig {

    std::string description;

    // path and if error on failure

    std::vector<std::pair<std::string, bool>> paths;

};
@@ -46,7 +47,7 @@ const std::map<std::string, TracingConfig> kTracingMap = { 
        {

                "ion",

                {"ION allocation",

         {{"/sys/kernel/debug/tracing/events/kmem/ion_alloc_buffer_start/enable", true}}},

                 {{"/sys/kernel/debug/tracing/events/kmem/ion_alloc_buffer_start/enable", false}}},

        },

};

camera/device/3.5/types.hal

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,14 @@ import @3.2::StreamBuffer; 
import @3.4::StreamConfiguration;

import @3.2::CameraBlobId;



/**

 * If the result metadata cannot be produced for a physical camera device part of a logical

 * multi-camera, then HAL must invoke the notification callback and pass a message with ERROR_RESULT

 * code and errorStreamId that contains the stream id associated with that physical device.

 * The behavior during absent result metadata remains unchanged for a logical or a non-logical

 * camera device and the errorStreamId must be set to -1.

 */



/**

 * StreamConfiguration:

 *

current.txt

+5 −3
Original line number Diff line number Diff line
@@ -396,6 +396,8 @@ da33234403ff5d60f3473711917b9948e6484a4260b5247acdafb111193a9de2 android.hardwar 
d702fb01dc2a0733aa820b7eb65435ee3334f75632ef880bafd2fb8803a20a58 android.hardware.gnss@1.0::IGnssMeasurementCallback

7c7721c0f773fcf422b71a4f558545e9e36acc973e58ca51e5bd53905cf46bc0 android.hardware.graphics.bufferqueue@1.0::IGraphicBufferProducer

d4fea995378bb4f421b4e24ccf68cad2734ab07fe4f874a126ba558b99df5766 android.hardware.graphics.composer@2.1::IComposerClient

f7d7cb747dc01a9fdb2d39a80003b4d8df9be733d65f5842198802eb6209db69 android.hardware.graphics.mapper@2.0::IMapper

65a021fa89085b62fc96b2b6d3bef2f9103cf4d63379c68bc154fd9eef672852 android.hardware.health@1.0::types

b7ecf29927055ec422ec44bf776223f07d79ad9f92ccf9becf167e62c2607e7a android.hardware.keymaster@4.0::IKeymasterDevice

574e8f1499436fb4075894dcae0b36682427956ecb114f17f1fe22d116a83c6b android.hardware.neuralnetworks@1.0::IPreparedModel

417ab60fe1ef786778047e4486f3d868ebce570d91addd8fe4251515213072de android.hardware.neuralnetworks@1.0::types
@@ -446,7 +448,7 @@ f7431f3e3e4e3387fc6f27a6cf423eddcd824a395dc4349d302c995ab44a9895 android.hardwar 
09ab9b24994429d9bb32a3fb420b6f6be3e47eb655139a2c08c4e80d3f33ff95 android.hardware.camera.device@3.5::ICameraDevice

06237de53c42890029e3f8fe7d1480d078469c0d07608e51c37b4d485d342992 android.hardware.camera.device@3.5::ICameraDeviceCallback

08c68b196e2fc4e5ba67ba0d0917bde828a87cbe2cffec19d04733972da9eb49 android.hardware.camera.device@3.5::ICameraDeviceSession

a848f7cb3cb3d080cf175bf08412322bfddb535168253796cdf777afdbf05b38 android.hardware.camera.device@3.5::types

f9b8b388c0c76669e4b9189e4943efd2982f9bda5c10e276f96cc91bc8e818d6 android.hardware.camera.device@3.5::types

f727d5f350f55a6d3354aad2feb64e43200de77c10d9d642465566bc260bb8ec android.hardware.camera.metadata@3.4::types

0fb39a7809ad1c52b3efbbed5ef4749b06c2a4f1f19cdc3efa2e3d9b28f1205c android.hardware.camera.provider@2.5::ICameraProvider

f5777403d65135a5407723671bc7a864cdca83aea13ee3ce2894b95e6588ca3a android.hardware.camera.provider@2.5::types
@@ -505,14 +507,14 @@ d36f747f9c9a8f2f21db2f8323c2d755dd08b34ce813932d7339979f7d490dab android.hardwar 
21aa259585caaa27b6470ebcd8509aabde0ef5d039160aa6425d589cb787488b android.hardware.media.c2@1.0::IInputSink

b9422a9aca84df1ff9623dc12c0562abce97716e28d63a965f2bfb88f9ad9607 android.hardware.media.c2@1.0::IInputSurface

0a786a19e6753f9774a7ca7781c2a2edfe5c0b5fa112355dfa0e50ebedeb08b9 android.hardware.media.c2@1.0::IInputSurfaceConnection

4cb139f729c29d8d6f4ecdab149c4feb571dad8a06e56cd57fcb52e70208bab4 android.hardware.media.c2@1.0::types

7d3c292ca75ec3e22a8fd4ae72d2edb0659d280257e763786e766f3429954dd1 android.hardware.media.c2@1.0::types

4880af120fc1640225abdc2c60bda6d79617d73484d5124913c7278af3b11e2d android.hardware.neuralnetworks@1.2::IBurstCallback

19877e466ad8c6ed42b38050b77bd010cf7800ff365fdc8574f45bbfda03a758 android.hardware.neuralnetworks@1.2::IBurstContext

b83317b66721241887d2770b5ae95fd5af1e77c5daa7530ecb08fae8892f2b43 android.hardware.neuralnetworks@1.2::IDevice

92714960d1a53fc2ec557302b41c7cc93d2636d8364a44bd0f85be0c92927ff8 android.hardware.neuralnetworks@1.2::IExecutionCallback

36e1064c869965dee533c537cefbe87e54db8bd8cd45be7e0e93e00e8a43863a android.hardware.neuralnetworks@1.2::IPreparedModel

e1c734d1545e1a4ae749ff1dd9704a8e594c59aea7c8363159dc258e93e0df3b android.hardware.neuralnetworks@1.2::IPreparedModelCallback

209a5ee694b94328afb2af2768f1fe6a69148e2cbb85ec3c340a36eed818c697 android.hardware.neuralnetworks@1.2::types

9b3963253e521cca19fd81aeca83aee6dcfe3bdf2805c07cb2d3f64381709b71 android.hardware.neuralnetworks@1.2::types

cf7a4ba516a638f9b82a249c91fb603042c2d9ca43fd5aad9cf6c0401ed2a5d7 android.hardware.nfc@1.2::INfc

abf98c2ae08bf765db54edc8068e36d52eb558cff6706b6fd7c18c65a1f3fc18 android.hardware.nfc@1.2::types

4cb252dc6372a874aef666b92a6e9529915aa187521a700f0789065c3c702ead android.hardware.power.stats@1.0::IPowerStats

graphics/composer/2.1/utils/hal/include/composer-hal/2.1/ComposerResources.h

+2 −2
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ class ComposerHandleCache { 
    }



    Error lookupCache(uint32_t slot, const native_handle_t** outHandle) {

        if (slot < mHandles.size()) {

        if (slot >= 0 && slot < mHandles.size()) {

            *outHandle = mHandles[slot];

            return Error::NONE;

        } else {
@@ -180,7 +180,7 @@ class ComposerHandleCache { 


    Error updateCache(uint32_t slot, const native_handle_t* handle,

                      const native_handle** outReplacedHandle) {

        if (slot < mHandles.size()) {

        if (slot >= 0 && slot < mHandles.size()) {

            auto& cachedHandle = mHandles[slot];

            *outReplacedHandle = cachedHandle;

            cachedHandle = handle;

graphics/mapper/2.0/IMapper.hal

+3 −0
Original line number Diff line number Diff line
@@ -147,6 +147,9 @@ interface IMapper { 
     * outside of accessRegion is undefined, except that it must not cause

     * process termination.

     *

     * An accessRegion of all-zeros means the entire buffer. That is, it is

     * equivalent to '(0,0)-(buffer width, buffer height)'.

     *

     * data will be filled with a pointer to the locked buffer memory. This

     * address will represent the top-left corner of the entire buffer, even

     * if accessRegion does not begin at the top-left corner.