diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2018-10-11 15:06:06 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-10-11 15:06:06 -0700 |
| commit | ccc832de45db1db8749de5bafe5e6a90ca4ff868 (patch) | |
| tree | 808a437e034440b64756f7fed8c2f62e9549c094 | |
| parent | 96e59abf90b0b95d1d26485b55509644cfc8f708 (diff) | |
| parent | 9df6b70ec9d967f6f688bae0fdeb467239f25b32 (diff) | |
| download | ml-pie-temp.tar.gz | |
Merge "Fix implicit fallthrough warnings."pie-temp
am: 9df6b70ec9
Change-Id: Ib399ba2a690dfb6411c11553352a367c5baa71a4
| -rw-r--r-- | nn/common/Utils.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nn/common/Utils.cpp b/nn/common/Utils.cpp index 76a2ee800..fba8bee03 100644 --- a/nn/common/Utils.cpp +++ b/nn/common/Utils.cpp @@ -1730,6 +1730,7 @@ ErrorStatus convertResultCodeToErrorStatus(int resultCode) { default: LOG(ERROR) << "Unknown result code " << resultCode << " mapped to ErrorStatus::GENERAL_FAILURE"; + return ErrorStatus::GENERAL_FAILURE; case ANEURALNETWORKS_BAD_STATE: case ANEURALNETWORKS_INCOMPLETE: case ANEURALNETWORKS_OP_FAILED: @@ -1750,6 +1751,7 @@ int convertErrorStatusToResultCode(ErrorStatus status) { default: LOG(ERROR) << "Unknown ErrorStatus " << toString(status) << " mapped to ANEURALNETWORKS_OP_FAILED"; + return ANEURALNETWORKS_OP_FAILED; case ErrorStatus::DEVICE_UNAVAILABLE: case ErrorStatus::GENERAL_FAILURE: case ErrorStatus::OUTPUT_INSUFFICIENT_SIZE: |