PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Align main thread checking by calling ThreadUtils"

Browse Source
This commit is contained in:
Treehugger Robot
2022-11-09 05:13:53 +00:00
committed by Gerrit Code Review
parent 08d03390ae ce0e8b9a4b
commit 48c386e54c
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/network/EthernetTetherPreferenceController.java
View File

@@ -26,6 +26,7 @@ import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.OnLifecycleEvent; import androidx.lifecycle.OnLifecycleEvent;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.settingslib.utils.ThreadUtils;
import java.util.HashSet; import java.util.HashSet;
@@ -74,7 +75,7 @@ public final class EthernetTetherPreferenceController extends TetherBasePreferen
@Override @Override
public boolean shouldEnable() { public boolean shouldEnable() {
ensureRunningOnMainLoopThread(); ThreadUtils.ensureMainThread();
String[] available = mTm.getTetherableIfaces(); String[] available = mTm.getTetherableIfaces();
for (String s : available) { for (String s : available) {
if (mAvailableInterfaces.contains(s)) { if (mAvailableInterfaces.contains(s)) {
@@ -94,11 +95,4 @@ public final class EthernetTetherPreferenceController extends TetherBasePreferen
return TetheringManager.TETHERING_ETHERNET; 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());
}
}
} }