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

Commit cd4510d8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I6c1af92f,Icf594d40 into rvc-dev-plus-aosp am: ea758da9

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12183964

Change-Id: I2aef13ff126859f843a42cfab9d75cf72c2d811e
parents a8abf8dc ea758da9
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar
# ABI preserving changes to HALs during Android S
cd84ab19c590e0e73dd2307b591a3093ee18147ef95e6d5418644463a6620076 android.hardware.neuralnetworks@1.2::IDevice
9625e85f56515ad2cf87b6a1847906db669f746ea4ab02cd3d4ca25abc9b0109 android.hardware.neuralnetworks@1.2::types
745295adfd826de650eedaf8cc6979f52a1cf30b04ea7a089a132d0089475e95 android.hardware.neuralnetworks@1.3::types
9e758e208d14f7256e0885d6d8ad0b61121b21d8c313864f981727ae55bffd16 android.hardware.neuralnetworks@1.3::types

# HALs released in Android S
# NOTE: waiting to freeze HALs until later in the release
+4 −4
Original line number Diff line number Diff line
@@ -5743,8 +5743,8 @@ struct Request {
     * Input data and information to be used in the execution of a prepared
     * model.
     *
     * The index of the input corresponds to the index in Model.inputIndexes.
     *   E.g., input[i] corresponds to Model.inputIndexes[i].
     * The index of the input corresponds to the index in Model.main.inputIndexes.
     *   E.g., input[i] corresponds to Model.main.inputIndexes[i].
     */
    vec<RequestArgument> inputs;

@@ -5752,8 +5752,8 @@ struct Request {
     * Output data and information to be used in the execution of a prepared
     * model.
     *
     * The index of the output corresponds to the index in Model.outputIndexes.
     *   E.g., output[i] corresponds to Model.outputIndexes[i].
     * The index of the output corresponds to the index in Model.main.outputIndexes.
     *   E.g., output[i] corresponds to Model.main.outputIndexes[i].
     */
    vec<RequestArgument> outputs;

+4 −4
Original line number Diff line number Diff line
@@ -508,8 +508,8 @@ struct Request {
     * Input data and information to be used in the execution of a prepared
     * model.
     *
     * The index of the input corresponds to the index in Model.inputIndexes.
     *   E.g., input[i] corresponds to Model.inputIndexes[i].
     * The index of the input corresponds to the index in Model.main.inputIndexes.
     *   E.g., input[i] corresponds to Model.main.inputIndexes[i].
     */
    vec<RequestArgument> inputs;

@@ -517,8 +517,8 @@ struct Request {
     * Output data and information to be used in the execution of a prepared
     * model.
     *
     * The index of the output corresponds to the index in Model.outputIndexes.
     *   E.g., output[i] corresponds to Model.outputIndexes[i].
     * The index of the output corresponds to the index in Model.main.outputIndexes.
     *   E.g., output[i] corresponds to Model.main.outputIndexes[i].
     */
    vec<RequestArgument> outputs;