diff --git a/src/com/android/settings/network/EthernetTetherPreferenceController.java b/src/com/android/settings/network/EthernetTetherPreferenceController.java index 58c1fd2d328..17b4b021315 100644 --- a/src/com/android/settings/network/EthernetTetherPreferenceController.java +++ b/src/com/android/settings/network/EthernetTetherPreferenceController.java @@ -26,6 +26,7 @@ import androidx.lifecycle.Lifecycle; import androidx.lifecycle.OnLifecycleEvent; import com.android.internal.annotations.VisibleForTesting; +import com.android.settingslib.utils.ThreadUtils; import java.util.HashSet; @@ -74,7 +75,7 @@ public final class EthernetTetherPreferenceController extends TetherBasePreferen @Override public boolean shouldEnable() { - ensureRunningOnMainLoopThread(); + ThreadUtils.ensureMainThread(); String[] available = mTm.getTetherableIfaces(); for (String s : available) { if (mAvailableInterfaces.contains(s)) { @@ -94,11 +95,4 @@ public final class EthernetTetherPreferenceController extends TetherBasePreferen return TetheringManager.TETHERING_ETHERNET; } - private void ensureRunningOnMainLoopThread() { - if (Looper.getMainLooper().getThread() != Thread.currentThread()) { - throw new IllegalStateException( - "Not running on main loop thread: " - + Thread.currentThread().getName()); - } - } }