diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-11 21:43:31 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-11 21:43:31 +0000 |
commit | 9df6b70ec9d967f6f688bae0fdeb467239f25b32 (patch) | |
tree | e448b7e80541f630af02a7468028bda5f97709ef | |
parent | 7076a8e3aa635e0a1a88c400e99f5a6865ac158c (diff) | |
parent | 319a27b35350abb2f5341a587d7f4b870f54eeda (diff) | |
download | ml-oreo-mr1-1.2-iot-release.tar.gz |
Merge "Fix implicit fallthrough warnings."android-o-mr1-iot-release-smart-display-r3oreo-mr1-1.2-iot-release
-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: |