commit 7083beb088f34c03430c9eb55ce42350e6bfe7fe
author Patrick Rohr <prohr@google.com> Wed Jun 08 15:32:08 2022 -0700
committer Patrick Rohr <prohr@google.com> Thu Jun 16 12:14:15 2022 -0700
tree 3ba999746d919e1bd5aa3f0e3e78dff8e38afed6
parent 8b9bea667bcaae83fc5bb4e9eda7e66fb2a21ba5

ethernet: clean up HandlerExecutor usage in test

Test: atest EthernetManagerTest
Change-Id: I290136b4628e6ee7756772faa477467b04aade2e

tests/cts/net/src/android/net/cts/EthernetManagerTest.kt

diff --git a/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt b/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
index e5a06c7..5af679f 100644
--- a/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
+++ b/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
@@ -44,7 +44,6 @@
 import android.net.cts.EthernetManagerTest.EthernetStateListener.CallbackEntry.InterfaceStateChanged
 import android.os.Build
 import android.os.Handler
-import android.os.HandlerExecutor
 import android.os.Looper
 import android.os.SystemProperties
 import android.platform.test.annotations.AppModeFull
@@ -100,6 +99,7 @@
     private val context by lazy { InstrumentationRegistry.getInstrumentation().context }
     private val em by lazy { context.getSystemService(EthernetManager::class.java) }
     private val cm by lazy { context.getSystemService(ConnectivityManager::class.java) }
+    private val handler by lazy { Handler(Looper.getMainLooper()) }
 
     private val ifaceListener = EthernetStateListener()
     private val createdIfaces = ArrayList<EthernetTestInterface>()
@@ -249,7 +249,7 @@
 
     private fun addInterfaceStateListener(listener: EthernetStateListener) {
         runAsShell(CONNECTIVITY_USE_RESTRICTED_NETWORKS) {
-            em.addInterfaceStateListener(HandlerExecutor(Handler(Looper.getMainLooper())), listener)
+            em.addInterfaceStateListener(handler::post, listener)
         }
         addedListeners.add(listener)
     }
@@ -257,7 +257,7 @@
     private fun createInterface(): EthernetTestInterface {
         val iface = EthernetTestInterface(
             context,
-            Handler(Looper.getMainLooper())
+            handler,
         ).also { createdIfaces.add(it) }
         with(ifaceListener) {
             // when an interface comes up, we should always see a down cb before an up cb.
@@ -295,7 +295,7 @@
 
     private fun requestTetheredInterface() = TetheredInterfaceListener().also {
         tetheredInterfaceRequest = runAsShell(NETWORK_SETTINGS) {
-            em.requestTetheredInterface(HandlerExecutor(Handler(Looper.getMainLooper())), it)
+            em.requestTetheredInterface(handler::post, it)
         }
     }