From 65b4f5fa5305405311e1bcc28914810fedf39fdc Mon Sep 17 00:00:00 2001 From: Kangping Dong Date: Wed, 10 Jul 2024 08:45:09 +0000 Subject: [PATCH] Revert "[Thread] post broacast receivers on the handler thread" This reverts commit f8aaac0dd050e3278ab3d89e49299c234b38c3d2. Reason for revert: see b/350586929 Change-Id: I34f3a87664992e5324f89bcf49e56707d0143743 --- .../thread/ThreadNetworkControllerService.java | 12 ++++++++---- .../net/thread/cts/ThreadNetworkControllerTest.java | 1 - .../thread/ThreadNetworkControllerServiceTest.java | 4 +++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java b/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java index 0c36c93e80..0c77deef08 100644 --- a/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java +++ b/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java @@ -523,10 +523,12 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - mHandler.post(() -> onUserRestrictionsChanged(isThreadUserRestricted())); + onUserRestrictionsChanged(isThreadUserRestricted()); } }, - new IntentFilter(UserManager.ACTION_USER_RESTRICTIONS_CHANGED)); + new IntentFilter(UserManager.ACTION_USER_RESTRICTIONS_CHANGED), + null /* broadcastPermission */, + mHandler); } private void onUserRestrictionsChanged(boolean newUserRestrictedState) { @@ -578,10 +580,12 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - mHandler.post(() -> onAirplaneModeChanged(isAirplaneModeOn())); + onAirplaneModeChanged(isAirplaneModeOn()); } }, - new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED)); + new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED), + null /* broadcastPermission */, + mHandler); } private void onAirplaneModeChanged(boolean newAirplaneModeOn) { diff --git a/thread/tests/cts/src/android/net/thread/cts/ThreadNetworkControllerTest.java b/thread/tests/cts/src/android/net/thread/cts/ThreadNetworkControllerTest.java index 41f34ff4e1..0e95703943 100644 --- a/thread/tests/cts/src/android/net/thread/cts/ThreadNetworkControllerTest.java +++ b/thread/tests/cts/src/android/net/thread/cts/ThreadNetworkControllerTest.java @@ -45,7 +45,6 @@ import static com.google.common.util.concurrent.MoreExecutors.directExecutor; import static org.junit.Assert.assertThrows; import static org.junit.Assert.fail; - import static java.util.concurrent.TimeUnit.MILLISECONDS; import android.content.Context; diff --git a/thread/tests/unit/src/com/android/server/thread/ThreadNetworkControllerServiceTest.java b/thread/tests/unit/src/com/android/server/thread/ThreadNetworkControllerServiceTest.java index 959e155a83..2f58943907 100644 --- a/thread/tests/unit/src/com/android/server/thread/ThreadNetworkControllerServiceTest.java +++ b/thread/tests/unit/src/com/android/server/thread/ThreadNetworkControllerServiceTest.java @@ -539,7 +539,9 @@ public final class ThreadNetworkControllerServiceTest { .when(mContext) .registerReceiver( any(BroadcastReceiver.class), - argThat(actualIntentFilter -> actualIntentFilter.hasAction(action))); + argThat(actualIntentFilter -> actualIntentFilter.hasAction(action)), + any(), + any()); return receiverRef; }