diff options
| author | Miao Wang <miaowang@google.com> | 2018-04-24 20:18:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-24 20:18:31 +0000 |
| commit | 72e7a00da840c127d1f9b18b60c5e243defec42c (patch) | |
| tree | 4adcd8d9a85f43cfb2a678aeda0d0e45d4328bdc | |
| parent | da754e01b78a20ba119ed59a55ee63619dbc1732 (diff) | |
| parent | 2dcdbd97a63fb2563b7fe9865cea8d04481a2e27 (diff) | |
| download | ml-72e7a00da840c127d1f9b18b60c5e243defec42c.tar.gz | |
Merge "Fix the error code ANEURALNETWORKS_UNMAPPABLE" into pi-dev
| -rw-r--r-- | nn/common/Utils.cpp | 4 | ||||
| -rw-r--r-- | nn/runtime/include/NeuralNetworks.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/nn/common/Utils.cpp b/nn/common/Utils.cpp index 233cd6850..c80a4fc51 100644 --- a/nn/common/Utils.cpp +++ b/nn/common/Utils.cpp @@ -1467,9 +1467,7 @@ ErrorStatus convertResultCodeToErrorStatus(int resultCode) { case ANEURALNETWORKS_INCOMPLETE: case ANEURALNETWORKS_OP_FAILED: case ANEURALNETWORKS_OUT_OF_MEMORY: -#if 0 - case ANEURALNETWORKS_UNMAPPABLE: // Same as BAD_STATE per http://b/68356625 -#endif + case ANEURALNETWORKS_UNMAPPABLE: return ErrorStatus::GENERAL_FAILURE; } } diff --git a/nn/runtime/include/NeuralNetworks.h b/nn/runtime/include/NeuralNetworks.h index a91219f9b..b1954b797 100644 --- a/nn/runtime/include/NeuralNetworks.h +++ b/nn/runtime/include/NeuralNetworks.h @@ -1570,8 +1570,8 @@ typedef enum { ANEURALNETWORKS_UNEXPECTED_NULL = 3, ANEURALNETWORKS_BAD_DATA = 4, ANEURALNETWORKS_OP_FAILED = 5, - ANEURALNETWORKS_UNMAPPABLE = 5, ANEURALNETWORKS_BAD_STATE = 6, + ANEURALNETWORKS_UNMAPPABLE = 7, } ResultCode; /** |