commit f53b05af794c8907f11a78aaf51ed7aad5b26888
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Feb 22 06:58:42 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 22 06:58:42 2024 +0000
tree 707854f13b494e59573db808d4e225aff2c1f814
parent 09836ec6b5acd488fb301f37f6d92029e42cfd0b
parent f54f07dbb866435ea1ab646590780eed6cec10ce

Merge "[Thread] remove OT_ERROR_DETACHED" into main am: f54f07dbb8

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

Change-Id: Idbd01dcb1134bec6aafbe43f2a3952713d0ccfbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java

diff --git a/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java b/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java
index fa2e38d..01d1179 100644
--- a/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java
+++ b/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java
@@ -46,7 +46,6 @@
 
 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 @@
                 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;