Merge "Align main thread checking by calling ThreadUtils" am: 48c386e54c am: 170a632a66 am: f97d2d6f1d

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2276131

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

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());
-        }
-    }
 }