joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "[Thread] convert OT_ERROR_INVALID_STATE to INTERNAL_ERROR" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-02-22 06:22:46 +00:00 • committed by Gerrit Code Review
commit 0d131ca017
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java
View file

@ -47,6 +47,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;
@ -740,9 +741,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:
@ -756,6 +754,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;
}