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

Commit f839bbed authored by David Gross's avatar David Gross
Browse files

resolve merge conflicts of 2a970cb8 to stage-aosp-master 

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I587517c463d2d334f1f16eb614923d06d2dcaaaf
parents 6a2dc249 2a970cb8

current.txt

+6 −0
Original line number Diff line number Diff line
@@ -380,3 +380,9 @@ e362203b941f18bd4cba29a62adfa02453ed00d6be5b72cdb6c4d7e0bf394a40 android.hardwar 
21757d0e5dd4b7e4bd981a4a20531bca3c32271ad9777b17b74eb5a1ea508384 android.hardware.wifi.supplicant@1.1::ISupplicantStaIface

cd4330c3196bda1d642a32abfe23a7d64ebfbda721940643af6867af3b3f0aa9 android.hardware.wifi.supplicant@1.1::ISupplicantStaIfaceCallback

10ff2fae516346b86121368ce5790d5accdfcb73983246b813f3d488b66db45a android.hardware.wifi.supplicant@1.1::ISupplicantStaNetwork



# ABI preserving changes to HALs during Android Q

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

b07802a3433a9abec67a41525dc04eab9efb62760414e1d37e2f72cc5ae9cb8a android.hardware.neuralnetworks@1.0::types

bf18f51bfee84461f9831f3754f5c68ce2b29e42fe9d59ef8a33163e77f8edbf android.hardware.neuralnetworks@1.1::types

neuralnetworks/1.0/IPreparedModel.hal

+6 −0
Original line number Diff line number Diff line
@@ -42,6 +42,12 @@ interface IPreparedModel { 
     * execute function. This callback must be provided with the ErrorStatus of

     * the execution.

     *

     * If the prepared model was prepared from a model wherein all

     * tensor operands have fully specified dimensions, and the inputs

     * to the function are valid, then the execution should launch

     * and complete successfully (ErrorStatus::NONE). There must be

     * no failure unless the device itself is in a bad state.

     *

     * Multiple threads can call the execute function on the same IPreparedModel

     * object concurrently with different requests.

     *

neuralnetworks/1.0/types.hal

+4 −2
Original line number Diff line number Diff line
@@ -1668,8 +1668,7 @@ struct Model { 
    vec<uint8_t> operandValues;



    /**

     * A collection of shared memory pools containing operand data that were

     * registered by the model.

     * A collection of shared memory pools containing operand values.

     *

     * An operand's value must be located here if and only if Operand::lifetime

     * equals OperandLifeTime::CONSTANT_REFERENCE.
@@ -1721,6 +1720,9 @@ struct RequestArgument { 
 * 1) Provides the input and output data to be used when executing the model.

 * 2) Specifies any updates to the input operand metadata that were left

 *    unspecified at model preparation time.

 *

 * An output must not overlap with any other output, with an input, or

 * with an operand of lifetime CONSTANT_REFERENCE.

 */

struct Request {

    /**

neuralnetworks/1.1/types.hal

+1 −2
Original line number Diff line number Diff line
@@ -404,8 +404,7 @@ struct Model { 
    vec<uint8_t> operandValues;



    /**

     * A collection of shared memory pools containing operand data that were

     * registered by the model.

     * A collection of shared memory pools containing operand values.

     *

     * An operand's value must be located here if and only if Operand::lifetime

     * equals OperandLifeTime::CONSTANT_REFERENCE.