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

Commit b1894ad3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Deprecate OEM types in NNAPI"

parents 3ed01792 341f6b33

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ da33234403ff5d60f3473711917b9948e6484a4260b5247acdafb111193a9de2 android.hardwar 
d702fb01dc2a0733aa820b7eb65435ee3334f75632ef880bafd2fb8803a20a58 android.hardware.gnss@1.0::IGnssMeasurementCallback

b7ecf29927055ec422ec44bf776223f07d79ad9f92ccf9becf167e62c2607e7a android.hardware.keymaster@4.0::IKeymasterDevice

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

1fb32361286b938d48a55c2539c846732afce0b99fe08590f556643125bc13d3 android.hardware.neuralnetworks@1.0::types

417ab60fe1ef786778047e4486f3d868ebce570d91addd8fe4251515213072de android.hardware.neuralnetworks@1.0::types

e22e8135d061d0e9c4c1a70c25c19fdba10f4d3cda9795ef25b6392fc520317c android.hardware.neuralnetworks@1.1::types

1d4a5776614c08b5d794a5ec5ab04697260cbd4b3441d5935cd53ee71d19da02 android.hardware.radio@1.0::IRadioResponse

271187e261b30c01a33011aea257c07a2d2f05b72943ebee89e973e997849973 android.hardware.radio@1.0::types

neuralnetworks/1.0/types.hal

+14 −3
Original line number Diff line number Diff line
@@ -55,10 +55,20 @@ enum OperandType : int32_t { 
     */

    TENSOR_QUANT8_ASYMM = 5,



    /** OEM specific scalar value. */

    /**

     * DEPRECATED. Since NNAPI 1.2, extensions are the preferred alternative to

     * OEM operation and data types.

     *

     * OEM specific scalar value.

     */

    OEM                 = 10000,



    /** A tensor of OEM specific values. */

    /**

     * DEPRECATED. Since NNAPI 1.2, extensions are the preferred alternative to

     * OEM operation and data types.

     *

     * A tensor of OEM specific values.

     */

    TENSOR_OEM_BYTE     = 10001,

};
@@ -1448,7 +1458,8 @@ enum OperationType : int32_t { 
    TANH = 28,



    /**

     * OEM specific operation.

     * DEPRECATED. Since NNAPI 1.2, extensions are the preferred alternative to

     * OEM operation and data types.

     *

     * This operation is OEM specific. It should only be used for OEM

     * applications.