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] remove OT_ERROR_DETACHED" into main am: f54f07dbb8

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2972792

Change-Id: I03424b4c144b330a3c7ec1f6e3f3548c1e25bffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-02-22 07:05:11 +00:00 • committed by Automerger Merge Worker
commit 685d2e9d52
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,6 @@ 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;
@ -756,7 +755,6 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
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;