From 9a7619cd992713b521b9394672ebeed9e9c35c56 Mon Sep 17 00:00:00 2001 From: Kangping Dong Date: Wed, 21 Feb 2024 22:12:27 +0800 Subject: [PATCH] [Thread] convert OT_ERROR_INVALID_STATE to INTERNAL_ERROR In most cases, OT_ERROR_INVALID_STATE in ot-daemon indicates an internal error. OtDaemonServer should actually maintain the state to make sure no OT_ERROR_INVALID_STATE error can be returned. Test: atest CtsThreadNetworkTestCases Change-Id: I9dd6667548048873bf0c5b8eb85d929dfcaef997 --- .../server/thread/ThreadNetworkControllerService.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java b/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java index 21e3927a5b..a16aed622c 100644 --- a/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java +++ b/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java @@ -46,6 +46,7 @@ import static android.net.thread.ThreadNetworkManager.PERMISSION_THREAD_NETWORK_ import static com.android.server.thread.openthread.IOtDaemon.ErrorCode.OT_ERROR_ABORT; import static com.android.server.thread.openthread.IOtDaemon.ErrorCode.OT_ERROR_BUSY; import static com.android.server.thread.openthread.IOtDaemon.ErrorCode.OT_ERROR_DETACHED; +import static com.android.server.thread.openthread.IOtDaemon.ErrorCode.OT_ERROR_FAILED_PRECONDITION; import static com.android.server.thread.openthread.IOtDaemon.ErrorCode.OT_ERROR_INVALID_STATE; import static com.android.server.thread.openthread.IOtDaemon.ErrorCode.OT_ERROR_NO_BUFS; import static com.android.server.thread.openthread.IOtDaemon.ErrorCode.OT_ERROR_PARSE; @@ -656,9 +657,6 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub return ERROR_ABORTED; case OT_ERROR_BUSY: return ERROR_BUSY; - case OT_ERROR_DETACHED: - case OT_ERROR_INVALID_STATE: - return ERROR_FAILED_PRECONDITION; case OT_ERROR_NO_BUFS: return ERROR_RESOURCE_EXHAUSTED; case OT_ERROR_PARSE: @@ -672,6 +670,10 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub return ERROR_UNSUPPORTED_CHANNEL; case OT_ERROR_THREAD_DISABLED: return ERROR_THREAD_DISABLED; + case OT_ERROR_FAILED_PRECONDITION: + return ERROR_FAILED_PRECONDITION; + case OT_ERROR_DETACHED: + case OT_ERROR_INVALID_STATE: default: return ERROR_INTERNAL_ERROR; }