| commit | 312b04761c219b24bcb8a6f58c9583bd5b553c11 | [log] [tgz] |
|---|---|---|
| author | Yang Sun <sunytt@google.com> | Thu May 23 11:08:40 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 23 11:08:40 2024 +0000 |
| tree | 1eb756ab98dde40c1de82a4ded7f453af2e2abae | |
| parent | db537e58671a24d636591b9415c11b97e463366e [diff] | |
| parent | 19aca4ce281b9908c7af7d6e9c9daf2ca4792a19 [diff] |
Merge "Update checkOnHandlerThread()" into main am: 19aca4ce28 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3013716 Change-Id: I2cb8667ccb9e9a152c3118351013ec432246998e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java b/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java index 0c200fd..afd6e9a 100644 --- a/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java +++ b/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java
@@ -465,6 +465,7 @@ private void setEnabledInternal( boolean isEnabled, boolean persist, @NonNull OperationReceiverWrapper receiver) { + checkOnHandlerThread(); if (isEnabled && isThreadUserRestricted()) { receiver.onError( ERROR_FAILED_PRECONDITION, @@ -960,7 +961,11 @@ private void checkOnHandlerThread() { if (Looper.myLooper() != mHandler.getLooper()) { - Log.wtf(TAG, "Must be on the handler thread!"); + throw new IllegalStateException( + "Not running on ThreadNetworkControllerService thread (" + + mHandler.getLooper() + + ") : " + + Looper.myLooper()); } }